Merge branch 'strong-dr' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Jul 2011 05:37:16 +0000 (07:37 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Jul 2011 05:37:16 +0000 (07:37 +0200)

Trivial merge