commit e06b1069397d9e2456964602244623ca6f38d5ea Merge: 8e48726 c6bb108 Author: Martin Sourada <mso at fedoraproject.org> Date: Sat Apr 2 21:47:27 2011 +0200 Merge branch 'master' into f15/master ---