Merge remote-tracking branch 'jens/for-4.2/core' into dm-4.2
authorMike Snitzer <snitzer@redhat.com>
Fri, 29 May 2015 18:17:16 +0000 (14:17 -0400)
committerMike Snitzer <snitzer@redhat.com>
Fri, 29 May 2015 18:17:16 +0000 (14:17 -0400)

Trivial merge