Merge branch 'master' into pakfire3
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 9 May 2011 20:47:39 +0000 (22:47 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 9 May 2011 20:47:39 +0000 (22:47 +0200)

Trivial merge