[libmatecomponent/f17: 2/2] Merge branch 'master' into f17

[leigh123linux]

commit 6d7f032fbc6bb8d606e77e0c69dd2f3667749e51
Merge: ebf35cb c74a0bc
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Oct 23 21:14:38 2012 +0100

    Merge branch 'master' into f17

 libmatecomponent.spec |   44 ++++++++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 18 deletions(-)
---