[tuxpaint/el6/master: 10/10] Merge branch 'master' into el6

[Matej Cepl]

commit 17eb1bd3f9b4ff6dbf141914e09cd9a695a2df39
Merge: 6f8218b fecf6ea
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Apr 12 18:43:04 2011 +0200

    Merge branch 'master' into el6

 sources                                |    2 +-
 tuxpaint-0.9.21-fix-desktop-file.patch |   10 ++++++++
 tuxpaint-0.9.21-link.patch             |   32 +++++++++++++++++++++++++++
 tuxpaint-0.9.21-makej.patch            |   25 +++++++++++++++++++++
 tuxpaint-0.9.21-memset.patch           |   25 +++++++++++++++++++++
 tuxpaint.spec                          |   37 +++++++++++++++++++++++++++----
 6 files changed, 125 insertions(+), 6 deletions(-)
---