Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Mon, 19 Apr 2010 16:51:17 +0000 (17:51 +0100)
committerIan Beckwith <ianb@erislabs.net>
Mon, 19 Apr 2010 16:51:17 +0000 (17:51 +0100)

Trivial merge