Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Sat, 24 Apr 2010 21:03:46 +0000 (22:03 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sat, 24 Apr 2010 21:03:46 +0000 (22:03 +0100)

Trivial merge