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

[alexlan]

commit f4e7d078c285a4c03c694ab795687d1682826055
Merge: ef56dac 69ec726 153696c
Author: Alex Lancaster <alexlan at fedoraproject.org>
Date:   Thu Aug 26 12:58:23 2010 -0400

    Initial pseudo merge for dist-git setup

---