commit d4fbe887b715b63362909982482aadab66b277b0 Merge: c397d68 0a3b983 Author: Jens Petersen <petersen at redhat.com> Date: Wed Sep 1 17:33:21 2010 +1000 Merge remote branch 'origin/master' into f14/master ---