Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <maniacikarus@ipfire.org>
Tue, 25 Jan 2011 23:32:12 +0000 (00:32 +0100)
committerChristian Schmidt <maniacikarus@ipfire.org>
Tue, 25 Jan 2011 23:32:12 +0000 (00:32 +0100)

Trivial merge