Merge remote branch 'origin/kernel-upgrade'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Tue, 26 Jan 2010 13:20:02 +0000 (14:20 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Tue, 26 Jan 2010 13:20:02 +0000 (14:20 +0100)

Trivial merge