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

[Rex Dieter]

commit 0d6950f907f7728829cefcd09bcea02d03c896d7
Merge: f998d6f 9c437e2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Aug 27 18:51:46 2012 -0500

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

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