Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <maniacikarus@ipfire.org>
Thu, 20 Jan 2011 19:11:04 +0000 (20:11 +0100)
committerChristian Schmidt <maniacikarus@ipfire.org>
Thu, 20 Jan 2011 19:11:04 +0000 (20:11 +0100)

Trivial merge