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

[Mamoru Tasaka]

commit 4099ee6288bd4415e64e2fdd46c054f7dbb779c8
Merge: 08a3c67 e56098f
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Nov 4 02:34:35 2012 +0900

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

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