Merge branch 'bug_6554' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 18 Apr 2013 13:29:32 +0000 (09:29 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 18 Apr 2013 13:29:32 +0000 (09:29 -0400)

Trivial merge