[qt-creator/f14: 2/2] Merge branch 'master' into f14

[Itamar Reis Peixoto]

commit 35f8be7358d5746a4e3274a8ee3c8da5252cf645
Merge: 1f14854 90d1714
Author: Itamar Reis Peixoto <itamar at ispbrasil.com.br>
Date:   Wed Jun 29 09:36:32 2011 -0300

    Merge branch 'master' into f14

 fix_qmlpuppet_installation.patch |   25 +++++++++++++++++++++++++
 qt-creator.spec                  |   11 ++++++++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---