Merge remote branch 'mru/pump_switch'
authorMichael Prokop <mika@grml.org>
Tue, 7 Dec 2010 12:42:30 +0000 (13:42 +0100)
committerMichael Prokop <mika@grml.org>
Tue, 7 Dec 2010 12:42:30 +0000 (13:42 +0100)
Signed-off-by: Michael Prokop <mika@grml.org>

Trivial merge