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

[Elder Marco]

commit 71ddaaae63cf25cdd3e631bd2b4758d815d5237a
Merge: 01e04da 6d92a74
Author: Elder Marco <eldermarco at fedoraproject.org>
Date:   Tue Dec 6 21:37:10 2011 -0200

    Merge branch 'master' into f15

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