Merge branch 'bug_9134' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 2 Dec 2012 14:17:06 +0000 (09:17 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 2 Dec 2012 14:17:06 +0000 (09:17 -0500)

Trivial merge