[gnome-mud/f13/master: 3/3] Merge branch 'master' into f13

[Sean Middleditch]

commit 1f42d21b3c9781f1bf7bb606e70124af6ef34094
Merge: 53041f1 ab19bff
Author: Sean Middleditch <sean at middleditch.us>
Date:   Thu Aug 5 21:01:37 2010 -0700

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore     |    1 -
 gnome-mud.spec |    9 ++++++++-
 sources        |    1 +
 3 files changed, 9 insertions(+), 2 deletions(-)
---