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

[Todd Zullinger]

commit d7088fd5fdc9f6d142086b3918bdcb57f1323de9
Merge: a6536a0 84a8287
Author: Todd Zullinger <tmz at pobox.com>
Date:   Tue Sep 21 11:55:18 2010 -0400

    Merge branch 'master' into f14

 git.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---