Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <christian.schmidt@ipfire.org>
Tue, 13 Jul 2010 09:36:35 +0000 (11:36 +0200)
committerChristian Schmidt <christian.schmidt@ipfire.org>
Tue, 13 Jul 2010 09:36:35 +0000 (11:36 +0200)

Trivial merge