Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorJason Skomorowski <jason@indexdata.com>
Fri, 25 Sep 2009 21:22:32 +0000 (17:22 -0400)
committerJason Skomorowski <jason@indexdata.com>
Fri, 25 Sep 2009 21:22:32 +0000 (17:22 -0400)

Trivial merge