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

[Dan Mashal]

commit d603bab3b9eeee4ce5fb6046193fe4eff443d071
Merge: cb7b0cc c74a0bc
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Tue Dec 4 00:31:18 2012 -0800

    Merge branch 'master' into f16

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