Merge branch 'bug_9685' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 21:30:38 +0000 (17:30 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 21:30:38 +0000 (17:30 -0400)

Trivial merge