[cdw/f16: 2/2] Merge branch 'master' into f16

[sebelk]

commit 76abfa2b43a0660c4c75f8e936e5678ef4278e4b
Merge: 0cf39f1 0b0cfe2
Author: Sergio Belkin <sebelk at fedoraproject.org>
Date:   Mon Oct 17 20:14:49 2011 -0300

    Merge branch 'master' into f16

 cdw.spec |   19 ++++++++++++++++---
 sources  |    2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)
---