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

[Russell Bryant]

commit 93fd4e99d69871026c2a4488d159fb4fb860e390
Merge: c4daec2 47044e7
Author: Russell Bryant <rbryant at redhat.com>
Date:   Thu Oct 13 12:58:04 2011 -0400

    Merge branch 'master' into f16

 matahari.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---