commit 941c8b492352d5be5934df81f70bfb541bd04ce5 Merge: 740114b b4c9d4d Author: Martin Stransky <stransky at redhat.com> Date: Mon Oct 10 16:59:39 2011 +0200 Merge branch 'master' into f15 ---