[dee/f15: 3/3] Merge commit '8e48fbc0eec223dcd8914baadc349ae8a9c10167' into f15

[Adam Williamson]

commit 976b5c7c9e121a5ac637fbe6dad1539eb2f961c1
Merge: 771aaad 8e48fbc
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri Oct 7 13:09:53 2011 -0700

    Merge commit '8e48fbc0eec223dcd8914baadc349ae8a9c10167' into f15

 .gitignore |    1 +
 dee.spec   |    8 ++++----
 sources    |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---