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

[Itamar Reis Peixoto]

commit f21091ea441ad5801b90dcc9a3dba098402259cd
Merge: 4d0cffd f25bbb9
Author: Itamar Reis Peixoto <itamar at itamar.ispbrasil.com.br>
Date:   Tue Nov 2 16:14:35 2010 -0200

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	qt-creator.spec
    	sources

 .gitignore      |    3 ++-
 qt-creator.spec |   19 ++++++++-----------
 sources         |    2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)
---