Merge branch 'bug_4906' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 17 Mar 2013 01:48:24 +0000 (21:48 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 17 Mar 2013 01:48:24 +0000 (21:48 -0400)

Trivial merge