[libmatecomponent/f18: 7/7] Merge remote-tracking branch 'origin/master' into f18

[Rex Dieter]

commit 605a92f0a9ca5be6830e18b8ff73e6cfc4a193e8
Merge: 460daa2 b0f0a37
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Aug 14 12:44:42 2012 -0500

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

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