[wxMaxima/el6/master: 13/13] Merge remote-tracking branch 'origin/master' into el6/master

[Rex Dieter]

commit 5e23d940f0eeb775d822f559e9a578329e4369d7
Merge: c1a37de 6f3a7c1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Feb 10 10:26:29 2011 -0600

    Merge remote-tracking branch 'origin/master' into el6/master
    
    Conflicts:
    	.gitignore
    	sources
    	wxMaxima.spec

 .gitignore    |    2 +-
 sources       |    2 +-
 wxMaxima.spec |   38 +++++++++++++++++++++++++++-----------
 3 files changed, 29 insertions(+), 13 deletions(-)
---