[clustermon: 7/7] Initial pseudo merge for dist-git setup

[Fabio M. Di Nitto]

commit dbaad96362318433aae48e70ac27dbc94e35f2f0
Merge: 2c7784b aa1c6cf ae22475
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Thu Aug 19 11:06:36 2010 +0200

    Initial pseudo merge for dist-git setup

---