Merge branch '4.5' into 4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 6 Oct 2009 18:55:18 +0000 (20:55 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 6 Oct 2009 18:55:18 +0000 (20:55 +0200)
commit46d12ba420b7c4870f6bab2c44002dbb48c35629
treee02f5af44537d8445ff20251065edf14d4516b4a
parentffeb69003a9c676064cdf7ec099a02c2fbcf2ad3
parentd47b7e6d0adcd675ba9da11818b3fa9acc3caff5
Merge branch '4.5' into 4.6

Conflicts:
tests/auto/networkselftest/tst_networkselftest.cpp
tests/auto/networkselftest/tst_networkselftest.cpp