Merge remote branch 'mfournier/varnish-data-reorg'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 3 Jul 2010 09:08:21 +0000 (11:08 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 3 Jul 2010 09:08:21 +0000 (11:08 +0200)

Trivial merge