Merge branch 'bug_9014' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 21 Mar 2013 15:08:38 +0000 (11:08 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 21 Mar 2013 15:08:38 +0000 (11:08 -0400)

Trivial merge