commit 09e4ab446121b8c0fb652236a2b6be60033921be Merge: e698a0f 534df8e Author: Jesse Keating <jkeating at redhat.com> Date: Thu Dec 9 15:01:55 2010 -0800 Initial pseudo merge for dist-git setup ---