[nemo/f18: 10/10] Merge branch 'master' into f18

[leigh123linux]

commit 1a1cb5fa0e5df2b77be5e08f65f086d650f95d15
Merge: 595d6cd 6713b00
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Oct 20 23:05:41 2012 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore

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