From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 24 Jul 2011 22:23:16 +0000 (+0200)
Subject: Merge branch 'master' into kernel
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=845e27c5bbd68a3895f9b1f415d96a595a1a67d1;hp=--cc

Merge branch 'master' into kernel
---

845e27c5bbd68a3895f9b1f415d96a595a1a67d1