commit e23ac6ef6ace00f1da37682ae4f01746a0cb021a Merge: 0a74afd 58c3c76 Author: Tomas Mraz <tmraz at fedoraproject.org> Date: Wed Mar 23 16:40:22 2011 +0100 Merge branch 'f15' ---