Merge branch 'sound_of_checkin'

author Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>

Mon, 25 Jul 2011 15:45:44 +0000 (11:45 -0400)

committer Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>

Mon, 25 Jul 2011 15:45:44 +0000 (11:45 -0400)
author Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Mon, 25 Jul 2011 15:45:44 +0000 (11:45 -0400)
committer Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Mon, 25 Jul 2011 15:45:44 +0000 (11:45 -0400)
diff --cc Open-ILS/xul/staff_client/server/circ/util.js
Simple merge
author	Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
	Mon, 25 Jul 2011 15:45:44 +0000 (11:45 -0400)
committer	Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
	Mon, 25 Jul 2011 15:45:44 +0000 (11:45 -0400)