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

[Paul Howarth]

commit 978a340430632dabf8b4568e5032d7a0c5718a0b
Merge: 32315de 58b5f53
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Nov 11 11:18:34 2010 +0000

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

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