[stage: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/stage

[rmattes]

commit c7aa808d4bca9bde698bb3d987da98a1a8e6f2bd
Merge: fab406d 7e3a281
Author: Rich Mattes <richmattes at gmail.com>
Date:   Mon Jan 16 21:35:32 2012 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/stage
    
    Conflicts:
    	stage.spec

 stage.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc stage.spec
index 8c4f9b7,0d0c524..d122dfe
--- a/stage.spec
+++ b/stage.spec
@@@ -124,10 -124,9 +124,13 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 +* Mon Jan 16 2012 Rich Mattes <richmattes at gmail.com> - 4.1.1-1
 +- Update to release 4.1.1
 +- Cleanup old patches
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.1-2.0e7f6agit
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Sun May 29 2011 Rich Mattes <richmattes at gmail.com> - 4.0.1-1.0e7f6agit
  - Latest git snapshot