[primer3/f16: 7/7] Merge branch 'master' into f16

[Pierre-YvesChibon]

commit e81c42737954594fc303aae02f56e84b63a1a99e
Merge: 6482a23 1cdaf28
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Tue Jun 26 09:19:28 2012 +0200

    Merge branch 'master' into f16

 .gitignore   |    1 +
 primer3.spec |   13 +++++++++++--
 sources      |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
---
diff --cc primer3.spec
index 2c0807c,31a7769..4cc09a5
--- a/primer3.spec
+++ b/primer3.spec
@@@ -79,6 -82,9 +82,12 @@@ rm -rf $RPM_BUILD_ROO
  * Wed Feb 22 2012 Pierre-Yves Chibon <pingou at pingoured.fr> - 2.3.0-1
  - Update to release 2.3.0
  
++<<<<<<< HEAD
++=======
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.3-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
++>>>>>>> master
  * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.3-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild