[d-feet/f13/master: 5/5] Merge branch 'master' into f13

[John Palmieri (J5)]

commit ccc668d2a27dcde0489e706af769fe0bf94a7313
Merge: 91d8799 3509a2f
Author: John (J5) Palmieri <johnp at redhat.com>
Date:   Mon Aug 23 16:01:10 2010 -0400

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore  |    1 -
 d-feet.spec |   17 ++++++++++++++---
 sources     |    2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)
---