Merge branch 'bug_3549' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 1 Mar 2013 00:30:36 +0000 (19:30 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 1 Mar 2013 00:30:36 +0000 (19:30 -0500)

Trivial merge