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

[leigh123linux]

commit cb028f541213660c44befc6118368839bdf519e1
Merge: 1a1cb5f 8eec786
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Oct 20 23:28:04 2012 +0100

    Merge branch 'master' into f18

 .gitignore                 |    1 +
 nemo.spec                  |   14 +++++++++-----
 remove_open_terminal.patch |   17 ++---------------
 sources                    |    2 +-
 4 files changed, 13 insertions(+), 21 deletions(-)
---