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

[Russell Bryant]

commit c4daec21664dfdd97adf6fff048f530a1ea00345
Merge: 143d45d d48d64f
Author: Russell Bryant <rbryant at redhat.com>
Date:   Mon Sep 26 14:22:21 2011 -0400

    Merge branch 'master' into f16

 .gitignore    |    1 +
 matahari.spec |   84 ++++++++++++++++++++++++++++++++++++---------------------
 sources       |    2 +-
 3 files changed, 55 insertions(+), 32 deletions(-)
---