[mspdebug/f15: 4/4] Merge branch 'master' into f15

[rspanton]

commit c74058dbb99494f23c7f30cc99b96827e5a93435
Merge: 55cf8c5 4439b21
Author: Robert Spanton <rspanton at zepler.net>
Date:   Tue Aug 30 16:29:59 2011 +0100

    Merge branch 'master' into f15
    
    Bring 0.17 into f15
    
    (Conflicts: mspdebug.spec)

 .gitignore    |    7 +++----
 mspdebug.spec |    7 +++++--
 sources       |    2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)
---
diff --cc mspdebug.spec
index 080760d,f6878e1..622239b
--- a/mspdebug.spec
+++ b/mspdebug.spec
@@@ -37,9 -37,9 +37,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man1/mspdebug.1*
  
  %changelog
+ * Tue Aug 30 2011 Rob Spanton <rspanton at zepler.net> - 0.17-1
+ - Bump up to 0.17
+ 
 +* Wed Jul 27 2011 Rob Spanton <rspanton at zepler.net> - 0.16-2
 +- Bump version up to 0.16, and tell people about it in the Changelog
 +
  * Wed Jul 27 2011 Rob Spanton <rspanton at zepler.net> - 0.16-1
  - Bump up to 0.16