Merge branch 'master' of git://gitorious.org/smack-next/kernel into next
James Morris [Sat, 22 Oct 2011 20:23:58 +0000 (22:23 +0200)]

Trivial merge