From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 25 Oct 2010 17:35:13 +0000 (+0200)
Subject: Merge remote branch 'stevee/fixes' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fa57bb1b82f037ddf8a9ba26171fd5e0c9961e4;p=ipfire-3.x.git

Merge remote branch 'stevee/fixes' into next
---

7fa57bb1b82f037ddf8a9ba26171fd5e0c9961e4