[libmatecomponent/f17: 10/10] Merge remote-tracking branch 'origin/master' into f17

[Rex Dieter]

commit ebf35cb9c191eecf60506ebd25018ffbdad2093a
Merge: 6deec26 605a92f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Aug 14 12:46:35 2012 -0500

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

 libmatecomponent.spec |   45 +++++++++++++++++++++------------------------
 1 files changed, 21 insertions(+), 24 deletions(-)
---