[ccsm/f15/master: 2/2] Merge commit 'f097c11eb3b9b077cd9a2d9ef0f4dd887164e681' into f15

[Adam Williamson]

commit de4c270a470728183d36d35c40d55571eb401a58
Merge: ad3e0fa f097c11
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Mar 23 18:22:20 2011 -0700

    Merge commit 'f097c11eb3b9b077cd9a2d9ef0f4dd887164e681' into f15

 .gitignore |    1 +
 ccsm.spec  |   13 ++++++++-----
 sources    |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
---