Merge branch 'bug_9605' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 31 Mar 2013 02:11:19 +0000 (22:11 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 31 Mar 2013 02:11:19 +0000 (22:11 -0400)

Trivial merge