Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorManiacikarus <maniacikarus@ipfire.org>
Fri, 12 Dec 2008 22:49:36 +0000 (23:49 +0100)
committerManiacikarus <maniacikarus@ipfire.org>
Fri, 12 Dec 2008 22:49:36 +0000 (23:49 +0100)

Trivial merge