Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authormaniacikarus <maniacikarus@ipfire.org>
Thu, 2 Apr 2009 16:33:17 +0000 (18:33 +0200)
committermaniacikarus <maniacikarus@ipfire.org>
Thu, 2 Apr 2009 16:33:17 +0000 (18:33 +0200)

Trivial merge