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

Trivial merge