[targetcli/f16: 2/2] Merge branch 'master' into f16

[Andy Grover]

commit 205af2eda84c4b9a77fb0840a3b4e6a8a7a5801f
Merge: 1e20771 6ae2b6b
Author: Andy Grover <agrover at redhat.com>
Date:   Tue Apr 17 13:03:24 2012 -0700

    Merge branch 'master' into f16

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