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

[Itamar Reis Peixoto]

commit ca410ce772392c55e56adc4af456be2fbcc684b6
Merge: 511b94d 972e126
Author: Itamar Reis Peixoto <itamar at ispbrasil.com.br>
Date:   Tue Jun 21 07:14:06 2011 -0300

    Merge branch 'master' into f15

 .gitignore      |    1 +
 qt-creator.spec |    5 ++++-
 sources         |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---