From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 23 Aug 2011 16:15:53 +0000 (+0200)
Subject: Merge branch 'next' into qemu0.15.0
X-Git-Tag: v2.9-core53~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ccc03bf9dd0ed64ad4bc8e1728c35dae59c55bf;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'next' into qemu0.15.0
---

9ccc03bf9dd0ed64ad4bc8e1728c35dae59c55bf