Merge branch 'bug_6554' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 1 Apr 2013 22:52:41 +0000 (18:52 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 1 Apr 2013 22:52:41 +0000 (18:52 -0400)

Trivial merge