Merge branch 'maint'
authorJohnathan Corgan <jcorgan@corganenterprises.com>
Mon, 5 Jul 2010 19:01:09 +0000 (12:01 -0700)
committerJohnathan Corgan <jcorgan@corganenterprises.com>
Mon, 5 Jul 2010 19:01:09 +0000 (12:01 -0700)

Trivial merge