[pcmanfm/f17: 2/2] Merge remote-tracking branch 'origin/master' into f17

[Mamoru Tasaka]

commit d4e986be26fc5b949a3504e52a457a458f3ff127
Merge: f40beb2 e56098f
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Nov 4 02:35:43 2012 +0900

    Merge remote-tracking branch 'origin/master' into f17

 .gitignore   |    1 +
 pcmanfm.spec |   17 ++++++++++++++---
 sources      |    2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)
---