Merge branch 'bug_8949' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 5 Nov 2012 13:39:58 +0000 (08:39 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 5 Nov 2012 13:39:58 +0000 (08:39 -0500)

Trivial merge