[gtkwave: 7/7] Merge branch 'master' into f13

[Paul Howarth]

commit ea5ccd5e4b10506d9666afcaf00ebd1198a9a543
Merge: fbb4faa 2e8f1fe
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Mar 29 11:13:11 2011 +0100

    Merge branch 'master' into f13

 .gitignore                    |    2 +-
 gtkwave-3.3.20-bz690920.patch |   35 +++++++++++++++
 gtkwave.spec                  |   92 ++++++++++++++++++++++++++++++++++------
 sources                       |    2 +-
 4 files changed, 115 insertions(+), 16 deletions(-)
---