[chirp/f15: 3/3] Merge branch 'master' into f15

[Richard Shaw]

commit 72dfa56182eb9d7023c32f2d7236d23c692c221f
Merge: acb85eb fea9bb9
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Mon Jun 4 11:21:35 2012 -0500

    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore

 .gitignore                |    3 +--
 chirp-0.2.0-install.patch |   23 -----------------------
 chirp-0.2.2-install.patch |   10 ++++++++++
 chirp.spec                |    8 ++++++--
 sources                   |    2 +-
 5 files changed, 18 insertions(+), 28 deletions(-)
---
diff --cc .gitignore
index 783025a,275a420..9f98def
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,1 @@@
- /chirp-0.2.0.tar.gz
- clog
 -/chirp-0.1.12.tar.gz
 -/chirp-0.2.0.tar.gz
+ /chirp-0.2.2.tar.gz