Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Sat, 26 May 2012 05:42:01 +0000 (05:42 +0000)
committerEquinox <info@esilibrary.com>
Sat, 26 May 2012 05:42:01 +0000 (05:42 +0000)

Trivial merge