Merge branch 'bug_9496' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 02:25:09 +0000 (22:25 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 02:25:09 +0000 (22:25 -0400)

Trivial merge