Kent Hansen 3b512ae142 Merge master into api_changes ... Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1		2012-03-23 14:10:58 +01:00
..
test.pro	Merge master into api_changes	2012-03-23 14:10:58 +01:00