From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 23 Nov 2010 21:14:08 +0000 (+0100)
Subject: Merge branch 'master' into upnp
X-Git-Tag: v2.9-beta1~48^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fupnp;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'master' into upnp
---

1d4b178db05de5f1274009b92037c33c631f2dbf