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

[Veeti Paananen]

commit 0dd6845eecfa301f987737bc70318e79fc8179e4
Merge: a8f6c60 034dcb8
Author: Veeti Paananen <veeti.paananen at rojekti.fi>
Date:   Fri Jan 27 22:09:41 2012 +0200

    Merge branch 'master' into f16
    
    Conflicts:
    	curlpp.spec

 curlpp.spec |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---