Merge branch '4.5' into 4.6-staging
authorThiago Macieira <thiago.macieira@nokia.com>
Sun, 27 Dec 2009 22:31:32 +0000 (23:31 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Sun, 27 Dec 2009 22:31:32 +0000 (23:31 +0100)
commit77900ebd910635a454b442f04275b8d6db60ab4a
tree6cea3e4a29bd25eca3a03b51de54318fd925fea1
parent1a1eeba0086d764474546da7fe443bf210d4d974
parent33985fb2020884955ed44db825ace7cf0ec32bbc
Merge branch '4.5' into 4.6-staging
src/dbus/qdbusmarshaller.cpp