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

[sebelk]

commit 0cf39f1f073552b61a49bd37b421eccb43090dc2
Merge: e020211 c31855b
Author: Sergio Belkin <sebelk at fedoraproject.org>
Date:   Fri Oct 14 13:12:26 2011 -0300

    Merge branch 'master' into f16

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---