Merge branch 'master' of https://github.com/evergreen-library-system/Evergreen into... user/catalystit/lpbug1006466
authorKyle Tomita <ktomita@catalystitservices.com>
Fri, 1 Feb 2013 17:04:21 +0000 (09:04 -0800)
committerKyle Tomita <ktomita@catalystitservices.com>
Fri, 1 Feb 2013 17:04:21 +0000 (09:04 -0800)

Trivial merge