[R-Rsolid/f13/master: 2/2] Merge branch 'master' into f13

[verdurin]

commit efdeac12dc0c36e8e4b5abf0e8736cd1e67cf3b0
Merge: 2a8310b 842092b
Author: Adam Huffman <bloch at verdurin.com>
Date:   Mon Aug 23 17:55:03 2010 +0100

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore    |    4 +---
 R-Rsolid.spec |    7 +++++--
 sources       |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
---