[spectrum/f14: 3/3] Merge branch 'master' into f14

[Matej Cepl]

commit 49c6b41d81c6ad20a3029aed0c47cd3e76b02397
Merge: f330d5a 4dda526
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Jun 14 01:19:19 2011 +0200

    Merge branch 'master' into f14

 spectrum.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---