Merge branch 'master' into content_proxy
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 25 Jul 2011 14:44:02 +0000 (16:44 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 25 Jul 2011 14:44:02 +0000 (16:44 +0200)

Trivial merge