commit cadcd27399cd2181f5d7672c95ca6b58d93aa482 Merge: 030ac7e 80b5552 Author: Adam Jackson <ajax at redhat.com> Date: Tue Dec 18 13:18:55 2012 -0500 Merge branch 'master' into f18 Conflicts: cairo.spec ---