Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Wed, 13 Apr 2011 23:02:51 +0000 (00:02 +0100)
committerIan Beckwith <ianb@erislabs.net>
Wed, 13 Apr 2011 23:02:51 +0000 (00:02 +0100)

Trivial merge