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

[Itamar Reis Peixoto]

commit bda6f334f16ae5d98c33bbed1e35c71c85983567
Merge: 86fbdae ab17179
Author: Itamar Reis Peixoto <itamar at ispbrasil.com.br>
Date:   Sat Jun 11 02:03:44 2011 -0300

    Merge branch 'master' into f14

 .gitignore      |    3 +++
 qt-creator.spec |   33 +++++++++++++++++++++++++++------
 sources         |    2 +-
 3 files changed, 31 insertions(+), 7 deletions(-)
---