Merge commit 'snapshot-start' into stable
authorIan Beckwith <ianb@erislabs.net>
Wed, 7 Sep 2011 22:58:03 +0000 (23:58 +0100)
committerIan Beckwith <ianb@erislabs.net>
Wed, 7 Sep 2011 22:58:03 +0000 (23:58 +0100)

Trivial merge