[luci: 12/12] Initial pseudo merge for dist-git setup

[Fabio M. Di Nitto]

commit 23cb2f53a215668fa2998e89e17e9fd8e5371a12
Merge: 91920f7 45a898d a070bea
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Thu Aug 19 10:59:27 2010 +0200

    Initial pseudo merge for dist-git setup

---