[libmatecanvas/f18: 3/3] Merge remote-tracking branch 'origin/master' into f18

[Rex Dieter]

commit 60bb80f5eacb7364c970a78d4f02cd2c35b62f62
Merge: d1d37b9 9c437e2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Aug 27 18:50:31 2012 -0500

    Merge remote-tracking branch 'origin/master' into f18
    
    Conflicts:
    	libmatecanvas.spec

 libmatecanvas.spec |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)
---