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

[Martin Stransky]

commit 5783aabdff3777a500f64bf2b4a4fa061b8f6c6b
Merge: b6965e4 dc81787
Author: Martin Stransky <stransky at redhat.com>
Date:   Thu Oct 27 16:45:45 2011 +0200

    Merge branch 'master' into f16

 nspluginwrapper.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---