[bzr-explorer/f16: 3/3] Merge branches 'master' and 'f16' into f16

[Julian Aloofi]

commit 537ac99e9b1ea7a43be32577b3036c3e485d9a13
Merge: 1a4b79d 083a9f9
Author: Julian Aloofi <julian.fedora at googlemail.com>
Date:   Mon Apr 30 23:05:46 2012 +0200

    Merge branches 'master' and 'f16' into f16

 .gitignore        |    1 +
 bzr-explorer.spec |   12 +++++++-----
 sources           |    2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
---