commit 501f93b563d91144661b8cf2cefb19975e3e5695 Merge: 03d69b5 0946c3d Author: John Eckersberg <jeckersb at redhat.com> Date: Tue Oct 5 20:32:52 2010 -0400 Merge branch 'f12' into 0.7.x ---