Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Thu, 16 Dec 2010 23:55:04 +0000 (23:55 +0000)
committerIan Beckwith <ianb@erislabs.net>
Thu, 16 Dec 2010 23:55:04 +0000 (23:55 +0000)

Trivial merge