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

[Fabian Affolter]

commit 2d097ffd0f48f792d3325e5511ca3b659907d600
Merge: 66d0427 a085d96
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Fri May 18 10:59:21 2012 +0200

    Merge branch 'master' into f16

 qtgpsc.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---