[gtkwave/el6/master: 18/18] Merge branch 'master' into el6

[Paul Howarth]

commit 4188cd835c398193c2c1e67d406891184207ad35
Merge: 9c77f34 05cb20d
Author: Paul Howarth <paul at city-fan.org>
Date:   Mon Sep 6 13:04:05 2010 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	gtkwave.spec
    	sources

 .gitignore   |    8 ++++----
 gtkwave.spec |   33 +++++++++++++++++++++++++++++++--
 sources      |    2 +-
 3 files changed, 36 insertions(+), 7 deletions(-)
---