Merge branch 'master' into solr_client
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 17 Aug 2010 11:16:54 +0000 (13:16 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 17 Aug 2010 11:16:54 +0000 (13:16 +0200)

Trivial merge