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

[Veeti Paananen]

commit 95b0cc5798069755f2df1d7f96cd5db21d05caf3
Merge: 0dd6845 4ba3148
Author: Veeti Paananen <veeti.paananen at rojekti.fi>
Date:   Mon Mar 19 23:20:55 2012 +0200

    Merge branch 'master' into f16

 curlpp.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---