[mesos/f21: 5/5] Merge branch 'f20' into f21

[tstclair]

commit 9177f13f98abc144730ae3438823e10594440189
Merge: 2d24786 3e7c6db
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Thu Oct 23 14:44:56 2014 -0500

    Merge branch 'f20' into f21
    
    Conflicts:
    	mesos.spec

 mesos.spec |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
---