Merge from svn
authordbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Mon, 26 May 2008 18:17:52 +0000 (18:17 +0000)
committerdbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Mon, 26 May 2008 18:17:52 +0000 (18:17 +0000)
commit5a3fcdee925ec280a563450c4fc5521fb0683073
tree708a5586e3d655e51291c03db973b340480e535d
parent19707e7d5899967852848da70d6e43958522395b
Merge from svn

git-svn-id: svn://svn.open-ils.org/ILS/trunk@9707 dcc99617-32d9-48b4-a31d-7c20da2025e4