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)
commitfe27d4b012273640e033be80f143bdc54daa8e16
tree4e58d69bf300ef2885644ec7f3950dc3fa87be3a
parentad9c2b048b605fbc8d50526e330b88abdd631ab2
parent676dac4b1bee0469d6932f698aeb77e8489f5861
Merge branch 'smack-next-master' into next