[gtkwave/el6/master: 2/2] Merge remote branch 'origin/master' into el6/master

[Paul Howarth]

commit e3eb8368a9f6b90f2ce0997bc8099544d6caaca1
Merge: 4188cd8 bd15660
Author: Paul Howarth <paul at city-fan.org>
Date:   Mon Sep 27 10:41:59 2010 +0100

    Merge remote branch 'origin/master' into el6/master

 .gitignore   |    2 +-
 gtkwave.spec |   12 +++++++++++-
 sources      |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
---