Merge branch 'master' into solr_client
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 11 Aug 2010 07:27:40 +0000 (09:27 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 11 Aug 2010 07:27:40 +0000 (09:27 +0200)

Trivial merge