[eet/f19: 3/3] Merge branch 'master' into f19

[Rex Dieter]

commit fc9c5cebc138041f848e5c13097a375befdb4a00
Merge: 2234359 9b9eec9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Jul 28 09:40:46 2013 -0500

    Merge branch 'master' into f19
    
    Conflicts:
    	eet.spec
    	sources
    
    for 1.7.7 (bug #989232)

 .gitignore |    2 ++
 eet.spec   |    5 ++++-
 sources    |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---