Merge branch 'bug_9529' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Feb 2013 12:21:04 +0000 (07:21 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Feb 2013 12:21:04 +0000 (07:21 -0500)

Trivial merge