[git/f15: 2/2] Merge branch 'master' into f15

[Todd Zullinger]

commit 761a711d9d05c1b4e1f47ef1891519f8e00d850e
Merge: 0b3f8a3 2768b15
Author: Todd Zullinger <tmz at pobox.com>
Date:   Wed Sep 7 11:04:07 2011 -0400

    Merge branch 'master' into f15

 git.spec |   17 +++++++++++++----
 sources  |    2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)
---