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

[rspanton]

commit 533ea77caa957b3d6e7d8378f012c5212bcb1fe1
Merge: c74058d d6aaeda
Author: Robert Spanton <rspanton at zepler.net>
Date:   Tue Nov 8 12:58:34 2011 +0000

    Merge branch 'master' into f15

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