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

[verdurin]

commit 3240e2065a74ac3ebcbb6556ee017d6ea05ab151
Merge: 758c1c0 4621c7a
Author: Adam Huffman <bloch at verdurin.com>
Date:   Fri Aug 27 11:02:35 2010 +0100

    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore

 .gitignore |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---