Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Mon, 8 Mar 2010 06:09:19 +0000 (06:09 +0000)
committerIan Beckwith <ianb@erislabs.net>
Mon, 8 Mar 2010 06:09:19 +0000 (06:09 +0000)

Trivial merge