Merge branch 'for-james' of git://tpmdd.git.sourceforge.net/gitroot/tpmdd/tpmdd into...
authorJames Morris <jmorris@namei.org>
Fri, 11 Feb 2011 06:34:47 +0000 (17:34 +1100)
committerJames Morris <jmorris@namei.org>
Fri, 11 Feb 2011 06:34:47 +0000 (17:34 +1100)

Trivial merge