[dmapd/f15: 7/7] Merge branch 'master' into f15

[mikep]

commit 75670130a02b96adac73cd24b34b8953ddfc17d7
Merge: b2ea4f6 3c1083a
Author: W. Michael Petullo <mike at flyn.org>
Date:   Mon Sep 26 16:22:24 2011 -0500

    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore
    	dmapd.spec
    	sources
    
    Signed-off-by: W. Michael Petullo <mike at flyn.org>

 .gitignore |    4 ++-
 dmapd.spec |   68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 sources    |    2 +
 3 files changed, 69 insertions(+), 5 deletions(-)
---