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

Trivial merge