[emacs-magit/f12/master: 4/4] Merge branch 'master' into f12

[Tom Moertel]

commit 5e25bfe854199fbf2a23cc7740501cd2c90858c4
Merge: 7bdf45a 0eeaa39
Author: Tom Moertel <tom at moertel.com>
Date:   Thu Aug 5 00:05:24 2010 -0400

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore

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