Merge branch 'bug_9689' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 15:16:39 +0000 (10:16 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 15:16:39 +0000 (10:16 -0500)

Trivial merge