merge (no change needed in 3.2)
authorGregory P. Smith <greg@krypto.org>
Wed, 14 Mar 2012 21:58:50 +0000 (14:58 -0700)
committerGregory P. Smith <greg@krypto.org>
Wed, 14 Mar 2012 21:58:50 +0000 (14:58 -0700)

Trivial merge