Merge branch '4.5' into 4.6-staging
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 5 Jan 2010 18:30:01 +0000 (19:30 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 5 Jan 2010 18:30:01 +0000 (19:30 +0100)
commite93f6fa2aa832037467e335641067c69832455da
treeda3dfb2ab891de671227d26fcc246cda68bd692f
parentf72165460d27860cabd51691f4d935fd74b50f80
parent10ca680e00fe514c32eb6364c4cca3ce46814076
Merge branch '4.5' into 4.6-staging