commit 4ceafc3e56aec95845732f48d59649ef949ff110 Merge: 0be308b 7701547 Author: Jesse Keating <jkeating at redhat.com> Date: Wed Dec 8 20:34:04 2010 -0800 Initial pseudo merge for dist-git setup ---