Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <maniacikarus@ipfire.org>
Fri, 1 Apr 2011 09:10:32 +0000 (11:10 +0200)
committerChristian Schmidt <maniacikarus@ipfire.org>
Fri, 1 Apr 2011 09:10:32 +0000 (11:10 +0200)

Trivial merge