[springlobby/f13/master: 3/3] Merge branch 'master' into f13

[Aurelien Bompard]

commit 236f185263247b57581b03ff3276ac40d005a1aa
Merge: ad5800a 941920a
Author: Aurelien Bompard <abompard at fedoraproject.org>
Date:   Wed Sep 15 06:52:44 2010 +0200

    Merge branch 'master' into f13

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