Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Mon, 21 May 2012 23:51:01 +0000 (23:51 +0000)
committerEquinox <info@esilibrary.com>
Mon, 21 May 2012 23:51:01 +0000 (23:51 +0000)

Trivial merge