[tktray/f13/master: 3/3] Merge branch 'master' into f13

[Miloš Jakubíček]

commit 362c98fe92fd622c15fc0c9278e442a33b67c492
Merge: f433d68 df0f1f2
Author: Milos Jakubicek <xjakub at fi.muni.cz>
Date:   Mon Aug 23 14:27:36 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore  |    1 +
 sources     |    2 +-
 tktray.spec |   18 +++++++++++-------
 3 files changed, 13 insertions(+), 8 deletions(-)
---