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

[Rex Dieter]

commit 43c2a168f9ae28cd3691b8f85994bef3895038ef
Merge: f8c6839 9c437e2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Aug 27 18:51:09 2012 -0500

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

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