Merge commit 'snapshot-start' into stable
authorIan Beckwith <ianb@erislabs.net>
Wed, 16 Feb 2011 23:15:21 +0000 (23:15 +0000)
committerIan Beckwith <ianb@erislabs.net>
Wed, 16 Feb 2011 23:15:21 +0000 (23:15 +0000)

Trivial merge