Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Thu, 8 Sep 2011 19:15:16 +0000 (20:15 +0100)
committerIan Beckwith <ianb@erislabs.net>
Thu, 8 Sep 2011 19:15:16 +0000 (20:15 +0100)

Trivial merge