Merge branch 'master' of git@192.168.77.10:oilspolicy
authorOpenSRF User <opensrf@coconut.sitka.bclibraries.ca>
Thu, 3 Dec 2009 20:02:13 +0000 (12:02 -0800)
committerOpenSRF User <opensrf@coconut.sitka.bclibraries.ca>
Thu, 3 Dec 2009 20:02:13 +0000 (12:02 -0800)

Trivial merge