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

[Martin Stransky]

commit 2ce63a7ed4e9ed15d8cedbd086b43eb9d0ce2dd6
Merge: 3b35916 dc81787
Author: Martin Stransky <stransky at redhat.com>
Date:   Thu Oct 27 16:45:49 2011 +0200

    Merge branch 'master' into f15

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