[ricci: 11/11] Initial pseudo merge for dist-git setup

[Fabio M. Di Nitto]

commit 67786855aca434e9be18a098c98cf82cfdb8f25e
Merge: 68793e0 a569c4c a768998
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Thu Aug 19 11:03:11 2010 +0200

    Initial pseudo merge for dist-git setup

---