From: Daniel Glanzmann <dg@ipfire.org>
Date: Tue, 30 Sep 2008 12:00:32 +0000 (+0200)
Subject: Merge branch 'work'
X-Git-Tag: v2.3-beta4~12^2~14
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=9655ffd20819e0202886f2d5c5cc0d2170fe853f

Merge branch 'work'
---

9655ffd20819e0202886f2d5c5cc0d2170fe853f