Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <maniacikarus@ipfire.org>
Sun, 11 Apr 2010 17:45:04 +0000 (19:45 +0200)
committerChristian Schmidt <maniacikarus@ipfire.org>
Sun, 11 Apr 2010 17:45:04 +0000 (19:45 +0200)

Trivial merge