Merge branch 'master' into for_mm
authorJan Kara <jack@suse.cz>
Tue, 24 Jun 2008 09:43:00 +0000 (11:43 +0200)
committerJan Kara <jack@suse.cz>
Tue, 24 Jun 2008 09:43:00 +0000 (11:43 +0200)

Trivial merge