Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into...
authorJames Morris <jmorris@namei.org>
Sun, 4 Jan 2009 21:56:01 +0000 (08:56 +1100)
committerJames Morris <jmorris@namei.org>
Sun, 4 Jan 2009 21:56:01 +0000 (08:56 +1100)

Trivial merge