Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <christian.schmidt@ipfire.org>
Thu, 27 May 2010 16:51:10 +0000 (18:51 +0200)
committerChristian Schmidt <christian.schmidt@ipfire.org>
Thu, 27 May 2010 16:51:10 +0000 (18:51 +0200)

Trivial merge