[wavpack/f13/master: 3/3] Merge branch 'master' into f13/master

[Peter Lemenkov]

commit e1bbc9d3e1048088df7c9245485d025fd3ace896
Merge: 1edc46b 605b36a
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Jan 9 16:40:17 2011 +0300

    Merge branch 'master' into f13/master
    
    Conflicts:
    	.gitignore

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 ...01-Fixed-default-values-in-pkgconfig-file.patch |   32 ++++++++++++++++++++
 wavpack-wavpack_pc_in.patch                        |   10 ------
 wavpack.spec                                       |   29 ++++++++++++------
 5 files changed, 53 insertions(+), 21 deletions(-)
---