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

Mon Aug 23 16:38:08 UTC 2010

commit cfef879944b417dac4c3a1b10cc4d22555820732
Merge: bd298d6 842092b
Author: Adam Huffman <bloch at verdurin.com>
Date:   Mon Aug 23 17:36:12 2010 +0100

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore

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