Merge branch 'bug_9484' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 31 Mar 2013 01:55:18 +0000 (21:55 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 31 Mar 2013 01:55:18 +0000 (21:55 -0400)

Trivial merge