[R-affydata/f15: 3/3] Merge branch 'master' into f15

[Pierre-YvesChibon]

commit 0ca77ffa7c13d039bdfd6f7368d2a739e0709d46
Merge: fc6b9aa 0f80390
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Nov 3 09:36:15 2011 +0100

    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore
    	R-affydata.spec
    	sources

 .gitignore      |    1 +
 R-affydata.spec |    8 ++++++++
 sources         |    2 +-
 3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --cc R-affydata.spec
index 3446c8b,c36111d..ac78d93
--- a/R-affydata.spec
+++ b/R-affydata.spec
@@@ -1,7 -1,7 +1,11 @@@
  %global packname  affydata
  
  Name:             R-%{packname}
++<<<<<<< HEAD
 +Version:          1.11.11
++=======
+ Version:          1.11.15
++>>>>>>> master
  Release:          1%{dist}
  Summary:          Affymetrix data for demonstration purpose