Code

Merge branch 'fl/memcached'
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 20 Apr 2009 13:09:56 +0000 (15:09 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 20 Apr 2009 13:09:56 +0000 (15:09 +0200)

Trivial merge