branching version 1.0. take 2
authorerickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Thu, 16 Oct 2008 21:31:07 +0000 (21:31 +0000)
committererickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Thu, 16 Oct 2008 21:31:07 +0000 (21:31 +0000)
git-svn-id: svn://svn.open-ils.org/OpenSRF/branches/rel_1_0@1458 9efc2488-bf62-4759-914b-345cdb29e865


Trivial merge