[spectrum/f12/master: 2/2] Merge branch 'master' into f12

[Matej Cepl]

commit 7d6f0cb8e68d16a00f54988fdcd3991dbc57a399
Merge: 492b7c4 bdefc8c
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Thu Nov 25 18:19:49 2010 +0100

    Merge branch 'master' into f12

 .gitignore             |    1 +
 sources                |    2 +-
 spectrum-tmpfiles.conf |    1 +
 spectrum.spec          |   17 ++++++++++++++++-
 4 files changed, 19 insertions(+), 2 deletions(-)
---