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

[leigh123linux]

commit 556eed2dbeb0871dc31e8edd8291224d93a05568
Merge: e662757 6713b00
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Oct 20 23:07:16 2012 +0100

    Merge branch 'master' into f17

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