1297406087 +1100
committer James Morris <jmorris@namei.org> 1297406087 +1100

Merge branch 'for-james' of git://tpmdd.git.sourceforge.net/gitroot/tpmdd/tpmdd into for-linus
î$nš’6x