Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x
authorJan Paul Tuecking <earl@ipfire.org>
Mon, 30 May 2011 16:10:04 +0000 (18:10 +0200)
committerJan Paul Tuecking <earl@ipfire.org>
Mon, 30 May 2011 16:10:04 +0000 (18:10 +0200)

Trivial merge