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

Trivial merge