Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into next
authorChristian Schmidt <maniacikarus@ipfire.org>
Wed, 6 Jul 2011 17:30:11 +0000 (19:30 +0200)
committerChristian Schmidt <maniacikarus@ipfire.org>
Wed, 6 Jul 2011 17:30:11 +0000 (19:30 +0200)

Trivial merge