Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Tue, 17 Nov 2009 03:48:47 +0000 (03:48 +0000)
committerIan Beckwith <ianb@erislabs.net>
Tue, 17 Nov 2009 03:48:47 +0000 (03:48 +0000)

Trivial merge