From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 May 2010 11:26:21 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f0b9531c2f6e919a4d20dc5c78ad4c4ea7ddea5;p=ipfire-3.x.git

Merge branch 'master' into next
---

5f0b9531c2f6e919a4d20dc5c78ad4c4ea7ddea5