Merge remote-tracking branch 'ms/thirteen' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 20 Jul 2012 07:08:40 +0000 (09:08 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 20 Jul 2012 07:08:40 +0000 (09:08 +0200)

Trivial merge