commit 17f98811deed6d2f7e854e4e94f0d33eaaf4c91f Merge: 689fe6e 14f841d Author: Nils Philippsen <nils at redhat.com> Date: Wed Sep 15 14:52:28 2010 +0200 Merge branch 'f12' Conflicts: rss-glx.spec ---