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

[Itamar Reis Peixoto]

commit f74a37c4fe663425f3c3def4d3da5db25b5d07cc
Merge: ca410ce 90d1714
Author: Itamar Reis Peixoto <itamar at ispbrasil.com.br>
Date:   Wed Jun 29 09:35:42 2011 -0300

    Merge branch 'master' into f15

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