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

[Todd Zullinger]

commit a6536a0972324901a0b4de1ce272575a75b677ea
Merge: 5107378 f279779
Author: Todd Zullinger <tmz at pobox.com>
Date:   Sun Sep 19 21:51:42 2010 -0400

    Merge branch 'master' into f14

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