Merge branch 'rand-map'
authorJens Axboe <axboe@kernel.dk>
Thu, 29 Nov 2012 20:56:06 +0000 (21:56 +0100)
committerJens Axboe <axboe@kernel.dk>
Thu, 29 Nov 2012 20:56:06 +0000 (21:56 +0100)

Trivial merge