Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into beanstalk collab/berick/beanstalk
authorBill Erickson <berick@esilibrary.com>
Thu, 26 Apr 2012 15:21:03 +0000 (11:21 -0400)
committerBill Erickson <berick@esilibrary.com>
Thu, 26 Apr 2012 15:21:03 +0000 (11:21 -0400)

Trivial merge