Merge branch 'master' into next
authorJan Paul Tuecking <earl@ipfire.org>
Tue, 31 May 2011 20:27:53 +0000 (22:27 +0200)
committerJan Paul Tuecking <earl@ipfire.org>
Tue, 31 May 2011 20:27:53 +0000 (22:27 +0200)

Trivial merge