[R-AnnotationDbi/f14: 6/6] Merge branch 'master' into f14

[Pierre-YvesChibon]

commit f16341780c863cacb19c5081017fb6d876aa8e43
Merge: 525d1fa ab452b0
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Nov 3 10:19:52 2011 +0100

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	R-AnnotationDbi.spec
    	sources

 .gitignore           |    4 ++++
 R-AnnotationDbi.spec |    5 ++++-
 sources              |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---