Merge branch 'bug_9429' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 15:52:17 +0000 (10:52 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 15:52:17 +0000 (10:52 -0500)

Trivial merge