[thunar-volman/el6: 10/10] Merge from master - 0.6.0

[Orion Poplawski]

commit 3bf836e7df51f5963a98979b1cb79ddfdfa927a8
Merge: deebd5c df16762
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri May 20 09:20:46 2011 -0600

    Merge from master - 0.6.0

 .gitignore                             |    2 +
 sources                                |    2 +-
 thunar-volman-0.3.80-icon-naming.patch |  122 ++++++++++++++++++++++++++++++++
 thunar-volman-0.3.80-parole.patch      |   21 ++++++
 thunar-volman.spec                     |   79 +++++++++++++++------
 5 files changed, 202 insertions(+), 24 deletions(-)
---