Merge branch 'master' of git+ssh://git.sitka.bclibraries.ca/sitka/sitka-tools
authorJames Fournie <jfournie@sitka.bclibraries.ca>
Mon, 14 Nov 2011 23:30:53 +0000 (15:30 -0800)
committerJames Fournie <jfournie@sitka.bclibraries.ca>
Mon, 14 Nov 2011 23:30:53 +0000 (15:30 -0800)

Trivial merge