[mate-file-manager/f16: 2/2] Merge branch 'master' into f16

[Dan Mashal]

commit 79d2bbc28a986e4a0b0829b6504c51d8be1aa938
Merge: d982836 ffc858d
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Mon Dec 3 22:48:27 2012 -0800

    Merge branch 'master' into f16

 .gitignore             |    1 +
 mate-file-manager.spec |   51 ++++++++++++++++--------------------------------
 sources                |    2 +-
 3 files changed, 19 insertions(+), 35 deletions(-)
---