Merge branch 'master' into acs_NFI

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

Fri, 30 Sep 2011 20:19:57 +0000 (16:19 -0400)

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

Fri, 30 Sep 2011 20:19:57 +0000 (16:19 -0400)
author Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Fri, 30 Sep 2011 20:19:57 +0000 (16:19 -0400)
committer Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Fri, 30 Sep 2011 20:19:57 +0000 (16:19 -0400)
diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
Simple merge
author	Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
	Fri, 30 Sep 2011 20:19:57 +0000 (16:19 -0400)
committer	Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
	Fri, 30 Sep 2011 20:19:57 +0000 (16:19 -0400)