[emacs-magit/f13/master: 3/3] Merge branch 'master' into f13

[Tom Moertel]

commit 495ec90ebf1bb2202973013d3c0e834ba40bd59f
Merge: 68be74a 0eeaa39
Author: Tom Moertel <tom at moertel.com>
Date:   Thu Aug 5 00:02:37 2010 -0400

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 emacs-magit.spec |    7 +++++--
 sources          |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
---