Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Sun, 10 Jan 2010 01:02:59 +0000 (01:02 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sun, 10 Jan 2010 01:02:59 +0000 (01:02 +0000)

Trivial merge