[tumbler/f16: 3/3] Merge branch 'master' into f16

[Christoph Wickert]

commit bcf193ae4b50145a7ed29a89b80943dce5ff833c
Merge: 39d2d0a 34738f2
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Thu Dec 8 09:19:22 2011 +0100

    Merge branch 'master' into f16

 .gitignore   |    1 +
 sources      |    2 +-
 tumbler.spec |   50 ++++++++++++++++++++++++--------------------------
 3 files changed, 26 insertions(+), 27 deletions(-)
---