Merge branch 'fast_track' into for_next
authorJan Kara <jack@suse.cz>
Wed, 5 Sep 2012 14:06:56 +0000 (16:06 +0200)
committerJan Kara <jack@suse.cz>
Wed, 5 Sep 2012 14:06:56 +0000 (16:06 +0200)

Trivial merge