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

[Rex Dieter]

commit cb7b0cca8d1eb52d11370c7f4606a29b6d6fc4c7
Merge: f39d69f 605a92f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Aug 14 12:47:05 2012 -0500

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

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