From: Mike Rylander <mrylander@gmail.com>
Date: Thu, 9 Jun 2011 18:10:12 +0000 (-0400)
Subject: Merge conflict resolution
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f399b10497ab8b2df6f7ee6acd6de8476bf6d4d2;p=evergreen%2Fequinox.git

Merge conflict resolution

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

f399b10497ab8b2df6f7ee6acd6de8476bf6d4d2