[fbzx/f16: 4/4] Merge branch 'master' into f16

[musuruan]

commit 6f8dc50978dfedc08e10f49c2ef62d992d4b5901
Merge: b748399 ddc688f
Author: Andrea Musuruane <musuruan at gmail.com>
Date:   Sun Aug 12 18:02:03 2012 +0200

    Merge branch 'master' into f16

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