From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 13 Dec 2010 01:10:32 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea622b33fb72af1835cfb5aa185a64fa69675dd1;p=ipfire-3.x.git

Merge branch 'master' into next
---

ea622b33fb72af1835cfb5aa185a64fa69675dd1