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

[tstclair]

commit 576552bee5fa90ab289d1ef8e53295d942b0e80e
Merge: e5ef46d f6d40b6
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Fri Aug 29 08:28:58 2014 -0500

    Merge branch 'f21'
    
    Conflicts:
    	mesos.spec

 mesos.spec |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)
---