[gcc-python-plugin/f16: 3/3] Merge branch 'master' into f16

[dmalcolm]

commit 9f6af1dbcf7acaeb13ef05b4f65b12bd7f306581
Merge: 44e8c78 c96a524
Author: David Malcolm <dmalcolm at redhat.com>
Date:   Tue Nov 29 19:02:23 2011 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	gcc-python-plugin.spec

 .gitignore                                    |    1 +
 gcc-python-plugin-0.6-fix-c-common-path.patch |   24 ------------------------
 gcc-python-plugin.spec                        |   12 +++++-------
 sources                                       |    2 +-
 4 files changed, 7 insertions(+), 32 deletions(-)
---
diff --cc gcc-python-plugin.spec
index f616095,ed11f8d..77f3e66
--- a/gcc-python-plugin.spec
+++ b/gcc-python-plugin.spec
@@@ -399,15 -394,12 +394,18 @@@ CheckPlugin 
  %doc examples
  
  %changelog
+ * Tue Nov 29 2011 David Malcolm <dmalcolm at redhat.com> - 0.7-1
+ - 0.7; drop patch 1
+ 
 -* Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-4
 +* Thu Oct 27 2011 David Malcolm <dmalcolm at redhat.com> - 0.6-4.2
 +- rebuild against newer gcc
 +
 +* Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-4.1
  - Rebuilt for glibc bug#747377
  
 +* Mon Oct 24 2011 David Malcolm <dmalcolm at redhat.com> - 0.6-3.1
 +- rebuild against newer gcc
 +
  * Mon Oct  3 2011 David Malcolm <dmalcolm at redhat.com> - 0.6-3
  - add hard requirement on the exact gcc version the plugin was built with