[drupal-service_links/f12/master: 5/5] Merge branch 'master' into f12

[Jon Ciesla]

commit 91e89a1e2cf8c487deb2b8bee9f29553339fd506
Merge: 5140ceb b0b92a2
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Oct 25 14:39:02 2010 -0500

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	drupal-service_links.spec

 drupal-service_links.spec |   19 ++++++++++---------
 sources                   |    2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --cc drupal-service_links.spec
index f0e56cd,532161f..a3f1f71
--- a/drupal-service_links.spec
+++ b/drupal-service_links.spec
@@@ -25,12 -25,12 +25,13 @@@ IceRocket
  
  %setup -qn service_links
  
- %patch0 -p0
+ #%patch0 -p0
+ 
 +
  %build
  
- chmod -x po/es.po
- chmod -x po/de.po
+ #chmod -x po/es.po
+ #chmod -x po/de.po
  cp %{SOURCE1} .
  
  %install
@@@ -50,9 -50,12 +51,9 @@@ rm -rf %{buildroot
  %{drupaldir}/modules/service_links
  
  %changelog
- * Fri Oct 09 2009 Jon Ciesla <limb at jcomserv.net> - 6.x.1.0-5
- - Patch for CVE-2009-3648 from madirish.net, BZ 528200, 528201.
+ * Mon Oct 25 2010 Jon Ciesla <limb at jcomserv.net> - 6.x.2.0-1
+ - New upstream, BZ 645757.
  
 -* Fri Oct 09 2009 Jon Ciesla <limb at jcomserv.net> - 6.x.1.0-5
 -- Patch for CVE-2009-3648 from madirish.net, BZ 528200, 528201.
 -
  * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.x.1.0-4
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild