Merge branch 'master' of ssh://glotzi@git.ipfire.org/pub/git/ipfire-2.x
authorDirk Wagner <glotzi@ipfire.org>
Fri, 16 Jul 2010 07:56:12 +0000 (09:56 +0200)
committerDirk Wagner <glotzi@ipfire.org>
Fri, 16 Jul 2010 07:56:12 +0000 (09:56 +0200)

Trivial merge