[fbzx/f13/master: 2/2] Merge branch 'master' into f13

[musuruan]

commit 21100e5b4abae284f38bb9a638c7ddc9b162af19
Merge: 5af6eb3 2b9e599
Author: Andrea Musuruane <musuruan at gmail.com>
Date:   Sat Apr 2 15:29:05 2011 +0200

    Merge branch 'master' into f13

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