[python-nltk/el6: 13/13] Merge branch 'master' into el6

[cheeselee]

commit 06bd1ca12ccb2468caa9982f25e7ce541713d343
Merge: 7cc0b1e b9c34b4
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Wed Dec 12 15:37:14 2012 +0800

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                    |    5 ++-
 nltk-0.9.2-use-sys-yaml.patch |    9 ----
 python-nltk.spec              |   96 ++++++++++++++++++++++------------------
 sources                       |    2 +-
 4 files changed, 58 insertions(+), 54 deletions(-)
---