[json-lib/f13/master: 4/4] Merge branch 'master' into f13

[Lubomir Rintel]

commit 983a370e9565dd6c3f80e6ac68512e1719d925fe
Merge: c9cbc03 c0cdd97
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Mon Aug 16 12:00:44 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	json-lib.spec

 json-lib.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---