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

[tstclair]

commit f6d40b66869d7eb6473308e9ac664753113cbd47
Merge: 0961fea 38aaf17
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Fri Aug 29 08:23:54 2014 -0500

    Merge branch 'f20' into f21

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