Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 22 Sep 2011 18:44:55 +0000 (04:44 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 22 Sep 2011 18:44:55 +0000 (04:44 +1000)
commit43a5b8d0d50b2e71a6a76899b3989552dae288c0
tree07d49fc36a62296bfd8a7e42af43e95e0012a866
parent244ccf1cd7434b4f9ef4dbcdb39ae5c70610952c
parent48f64fc7ae9f0e9e8ab07ab60ccd55d3b053dfab
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix broken Solaris build (getpwnam_r usage)