Merge commit 'origin/next' into kernel-update
authorroot <root@iConnect.warriors.homedns.org>
Sun, 18 Mar 2012 14:58:21 +0000 (15:58 +0100)
committerroot <root@iConnect.warriors.homedns.org>
Sun, 18 Mar 2012 14:58:21 +0000 (15:58 +0100)

Trivial merge