[gnomint: 10/10] Merge remote branch 'origin/f12/master'

[verdurin]

commit a10e6d3ec40b313bc5799841d544affa9112e25d
Merge: 3240e20 1104fec
Author: Adam Huffman <bloch at verdurin.com>
Date:   Fri Aug 27 11:19:51 2010 +0100

    Merge remote branch 'origin/f12/master'
    
    Conflicts:
    	gnomint.spec
    	sources

---