Merge commit 'snapstart' into stable
authorIan Beckwith <ianb@erislabs.net>
Mon, 11 Apr 2011 22:32:46 +0000 (23:32 +0100)
committerIan Beckwith <ianb@erislabs.net>
Mon, 11 Apr 2011 22:32:46 +0000 (23:32 +0100)

Trivial merge