Merge branch 'for-1205' of http://git.gitorious.org/smack-next/kernel into next

Pull request from Casey.