[meld/f15/master: 2/2] Merge branch 'master' into f15

[Christoph Wickert]

commit 47c4d09633a4118020529a48d48152741b4fdbd4
Merge: 7469d3a 8cbb444
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Mon Apr 4 01:03:21 2011 +0200

    Merge branch 'master' into f15

 meld.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---