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

[Julian Aloofi]

commit cb957ade0028221b99bdbc0778df19fe9a2aacc5
Merge: 1f36fb6 82723ad
Author: Julian Aloofi <julian.fedora at googlemail.com>
Date:   Fri Jul 29 19:24:51 2011 +0200

    Merge branches 'master' and 'f15' into f15

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