[virt-v2v/f15/master: 2/2] Merge branch 'f14' into f15

[Matthew Booth]

commit 0954bb94406073055cc65f4f4cb4fa359e18cfba
Merge: 23da3b8 0d6faa0
Author: Matthew Booth <mbooth at redhat.com>
Date:   Tue Apr 26 21:09:09 2011 +0100

    Merge branch 'f14' into f15

 .gitignore    |    1 +
 sources       |    2 +-
 virt-v2v.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---