From: Mike Rylander <mrylander@gmail.com>
Date: Thu, 2 Jun 2011 14:34:48 +0000 (-0400)
Subject: Hand-fixed merge
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=100723078317805cf07f2c45566d2eb8a4698925;p=evergreen%2Fequinox.git

Hand-fixed merge

Signed-off-by: Mike Rylander <mrylander@gmail.com>
---

100723078317805cf07f2c45566d2eb8a4698925