Merge branch 'master' of ssh://glotzi@git.ipfire.org/pub/git/ipfire-2.x
authorDirk Wagner <glotzi@ipfire.org>
Sat, 10 Jul 2010 10:41:05 +0000 (12:41 +0200)
committerDirk Wagner <glotzi@ipfire.org>
Sat, 10 Jul 2010 10:41:05 +0000 (12:41 +0200)

Trivial merge