[beakerlib/el6: 3/3] Merge branch 'master' into el6

[Dalibor Pospisil]

commit 362673590fa91e44d4310314d3b4e3a147a68b53
Merge: 4060a8a c65a394
Author: Dalibor Pospisil <dapospis at redhat.com>
Date:   Wed Feb 4 12:03:57 2015 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	beakerlib.spec

 beakerlib.spec                      |   13 ++++++++-----
 do-remount-if-already-mounted.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)
---