[R-Rsolid/f13/master: 4/4] Merge remote branch 'origin/f13/master'

[verdurin]

commit ac782546a630c23b645d0fcda7c00a734800bb6e
Merge: c7a7b59 aa6d657
Author: Adam Huffman <adam.huffman at manchester.ac.uk>
Date:   Thu Aug 5 12:40:21 2010 +0100

    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore
    	R-Rsolid.spec
    	sources

 .gitignore |    3 +++
 sources    |    4 ++++
 2 files changed, 7 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 87db9df,1640e98..9026eeb
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,1 +1,5 @@@
  Rsolid_0.9-2.tar.gz
++<<<<<<< HEAD
 +Rsolid_0.9-3.tar.gz
++=======
++>>>>>>> origin/f13/master
diff --cc sources
index 1bcfae9,f530cea..41a0bf3
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +7bd55d9f959d7d1422dde7056bab258c  Rsolid_0.9-3.tar.gz
++=======
+ 4a619392ad87865bc4f4c1588199f75a  Rsolid_0.9-2.tar.gz
++>>>>>>> origin/f13/master