[rubygem-json/f13/master: 5/5] Merge branch 'master' into f13

[Xavier LAMIEN]

commit 2d896e934d194ad64cb0af5cd559533355fe9145
Merge: 2c30281 e29fc16
Author: Xavier Lamien <laxathom at fedoraproject.org>
Date:   Fri Aug 13 01:00:51 2010 +0200

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

 .gitignore |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---