Merge branch 'pakfire3'
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 15 Jun 2011 14:35:57 +0000 (16:35 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 15 Jun 2011 14:35:57 +0000 (16:35 +0200)

Trivial merge