[python-demjson/el6/master: 7/7] Merge branch 'master' into el6

[Thomas Moschny]

commit a1667c9fd98eb00c2858ed4551885b55ade1b0fc
Merge: 82961c4 95f374c
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Thu Jan 20 19:29:34 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore          |    4 +++-
 python-demjson.spec |   19 +++++++++++++++----
 sources             |    2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)
---