Merge branch 'restriper' of git://github.com/idryomov/btrfs-progs
authorChris Mason <chris.mason@oracle.com>
Sun, 5 Feb 2012 15:14:09 +0000 (10:14 -0500)
committerChris Mason <chris.mason@oracle.com>
Sun, 5 Feb 2012 15:14:09 +0000 (10:14 -0500)

Trivial merge