[pocketsphinx/f13/master: 4/4] Merge branch 'master' into f13

[Jerry James]

commit dced4854a2f65959fa51f89c86470b5aff406c4a
Merge: 7bc8d9a 9f7883f
Author: Jerry James <loganjerry at gmail.com>
Date:   Mon Aug 16 15:02:03 2010 -0600

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore                                         |    2 +-
 pocketsphinx-0.5.1-doc.patch                       |   33 ----------------
 ...python.patch => pocketsphinx-0.6.1-python.patch |   11 ++---
 pocketsphinx.spec                                  |   40 ++++++++++++--------
 sources                                            |    2 +-
 5 files changed, 31 insertions(+), 57 deletions(-)
---