Merge branch 'smack-next-master' into next
authorJames Morris <jmorris@namei.org>
Thu, 2 Dec 2010 21:21:01 +0000 (08:21 +1100)
committerJames Morris <jmorris@namei.org>
Thu, 2 Dec 2010 21:21:01 +0000 (08:21 +1100)

Trivial merge