Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Wed, 22 Dec 2010 23:15:00 +0000 (23:15 +0000)
committerIan Beckwith <ianb@erislabs.net>
Wed, 22 Dec 2010 23:15:00 +0000 (23:15 +0000)

Trivial merge