Merge branch 'bug_9914' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 14:48:48 +0000 (10:48 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 14:48:48 +0000 (10:48 -0400)

Trivial merge