From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 5 Sep 2009 10:38:32 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Tag: v2.5-core31~50
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=310a18fab33a18d7ebf6b8d9f78ede1ae9606fcc

Merge branch 'next'
---

310a18fab33a18d7ebf6b8d9f78ede1ae9606fcc