Merge branch 'bug_9179' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 17 Jan 2013 23:31:03 +0000 (18:31 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 17 Jan 2013 23:31:03 +0000 (18:31 -0500)

Trivial merge