Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Mon, 20 Dec 2010 20:57:58 +0000 (20:57 +0000)
committerIan Beckwith <ianb@erislabs.net>
Mon, 20 Dec 2010 20:57:58 +0000 (20:57 +0000)

Trivial merge