Merge branch 'bug_7969' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 19 Feb 2013 16:04:52 +0000 (11:04 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 19 Feb 2013 16:04:52 +0000 (11:04 -0500)

Trivial merge