[mspdebug/f15: 3/3] Merge branch 'master' into f15

[rspanton]

commit 47e9db52e65b7642e30279a48b6daf55c9ac2d68
Merge: c06a850 854c4e1
Author: Rob Spanton <rspanton at zepler.net>
Date:   Fri Apr 20 16:34:37 2012 +0100

    Merge branch 'master' into f15

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