Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Tue, 22 May 2012 08:30:02 +0000 (08:30 +0000)
committerEquinox <info@esilibrary.com>
Tue, 22 May 2012 08:30:02 +0000 (08:30 +0000)

Trivial merge