Merge remote-tracking branch 'origin/master' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 10 Apr 2012 18:30:23 +0000 (20:30 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 10 Apr 2012 18:30:23 +0000 (20:30 +0200)

Trivial merge