commit f5be1aca25fad8c8e28d685b4b0db4ce7a641773 Merge: 0f96bf8 0e35918 Author: Tomas DabaĊĦinskas <tomas at redhat.com> Date: Tue Sep 11 03:37:36 2012 +1000 Merge branch 'master' into el6 Conflicts: .gitignore ---