Merge branch 'upstream'
authorIan Beckwith <ianb@erislabs.net>
Sat, 28 Jan 2012 23:10:18 +0000 (23:10 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sat, 28 Jan 2012 23:10:18 +0000 (23:10 +0000)

Trivial merge