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

[leigh123linux]

commit fc292d8c88c48e5bff3ce550d66270d06ad1d90d
Merge: 166abd6 430649b
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Nov 14 23:02:47 2012 +0000

    Merge branch 'master' into f18

 .gitignore |    1 +
 nemo.spec  |   11 +++++++++--
 sources    |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
---