From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 26 Sep 2008 05:38:52 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.3-beta4~14^2~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c80da6bf54a68140197c22b83ad92c4323cac3f;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
---

6c80da6bf54a68140197c22b83ad92c4323cac3f