Merge branch 'serge-next' into next
authorJames Morris <jmorris@namei.org>
Wed, 26 Nov 2008 05:26:44 +0000 (10:56 +0530)
committerJames Morris <jmorris@namei.org>
Wed, 26 Nov 2008 05:26:44 +0000 (10:56 +0530)

Trivial merge