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)
commit6da559dce5f4743456a26da6c966d043b85dbd69
tree6420a872e42b4491867405af7825ffa45f216033
parentf45a562882b4dd66c64db285900efbf18194ccf4
parent8147fe1009e24e218bf20b9f6c1b94fd9465ffda
Merge remote branch 'mru/pump_switch'

Signed-off-by: Michael Prokop <mika@grml.org>