commit cbb00197b664276f98b22d0531c342231d4d6ae0 Merge: 98e6119 72b3729 Author: Kyle McMartin <kyle at redhat.com> Date: Thu Dec 9 13:51:51 2010 -0500 Merge branch 'master' into kernel-git ---