commit ba316d4633f8d5f80d509a0f725c6916005dd7a4 Merge: 0e62e0f 31be273 Author: Christian Krause <chkr at fedoraproject.org> Date: Wed Oct 6 22:11:50 2010 +0200 Merge branch 'master' into f14 ---