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

[Elder Marco]

commit 01e04daadf22dae0545ba02815a94869cf1e240a
Merge: dbab680 d83e3eb
Author: Elder Marco <eldermarco at fedoraproject.org>
Date:   Tue Nov 15 21:25:35 2011 -0200

    Merge branch 'master' into f15

 .gitignore |    1 +
 sources    |    2 +-
 yad.spec   |   10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)
---