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

[Paul Howarth]

commit 32315de1fb3612a21c7fcabbd694b7edd561ecec
Merge: e3eb836 1aa40c0
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Oct 27 11:48:35 2010 +0100

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

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