Merge branch 'stable' debian/20100704+stable-1
authorIan Beckwith <ianb@erislabs.net>
Sun, 4 Jul 2010 02:08:08 +0000 (03:08 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sun, 4 Jul 2010 02:08:08 +0000 (03:08 +0100)

Trivial merge