Merge branch 'bug_9068' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 02:08:15 +0000 (22:08 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 02:08:15 +0000 (22:08 -0400)

Trivial merge