commit 2b124af8ca7bab13c727a7899945f8e041b7f0e9 Merge: 4f93e95 01a9e61 Author: Toshio Kuratomi <toshio at fedoraproject.org> Date: Thu Jan 13 08:23:33 2011 -0800 Merge branch 'master' into el6 ---