Merge remote-tracking branch 'ms/thirteen' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 27 Jul 2012 15:34:45 +0000 (17:34 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 27 Jul 2012 15:34:45 +0000 (17:34 +0200)

Trivial merge