[alure/f14: 2/2] Merge branches 'master' and 'f14' into f14

[Julian Aloofi]

commit 60bef738893288098c8361c2032d810e12d9ba32
Merge: 950beef 82723ad
Author: Julian Aloofi <julian.fedora at googlemail.com>
Date:   Fri Jul 29 19:35:29 2011 +0200

    Merge branches 'master' and 'f14' into f14

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