Merge remote branch 'staging/master' into 4.7
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 13 Apr 2010 13:41:58 +0000 (15:41 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 13 Apr 2010 13:41:58 +0000 (15:41 +0200)
commit9ef3b0687df14f738ac59d447a0cc438ef270744
treede4e9652178c5949402e9a5e313fb4188df71588
parente00f4f31f996e6c194974e748d5c1505ed188a3b
parentaeaa61a4b8ad7339bd5d1a32374c05253ce971da
Merge remote branch 'staging/master' into 4.7