Merge branch 'sitka_2_2'
authorJennifer Pringle <jpringle@sitka.bclibraries.ca>
Mon, 2 Jul 2012 01:43:22 +0000 (18:43 -0700)
committerJennifer Pringle <jpringle@sitka.bclibraries.ca>
Mon, 2 Jul 2012 01:43:22 +0000 (18:43 -0700)

Trivial merge