for-linus-20130206
Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-linus