[netcdf/f14: 3/3] fix merge

[Peter Robinson]

commit 211bf20c90ec80fe4707a81c9bcf255825da0657
Merge: e300cee aaadeea
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Aug 12 11:09:59 2011 +0100

    fix merge

 netcdf.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc netcdf.spec
index 3f9e8f0,a8dbb1c..dd1e240
--- a/netcdf.spec
+++ b/netcdf.spec
@@@ -165,8 -165,11 +165,11 @@@ f
  
  
  %changelog
+ * Thu Aug 11 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 4.1.1-6
+ - Add ARM to valgrind excludes
+ 
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.1-5
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 +* Mon Dec 6 2010 jspaleta[at]fedoraproject.org - 4.1.1-5
 +- rebuild to match gcc-gfortran versioning information 
  
  * Mon Jul 19 2010 Dan Horák <dan[at]danny.cz> - 4.1.1-4
  - no valgrind on s390(x)