Merge commit 'origin/4.5' into 4.6
authorRhys Weatherley <rhys.weatherley@nokia.com>
Thu, 17 Sep 2009 22:20:46 +0000 (08:20 +1000)
committerRhys Weatherley <rhys.weatherley@nokia.com>
Thu, 17 Sep 2009 22:20:46 +0000 (08:20 +1000)
commit3ec54c15f37c8f74fc86486abf67697eb1f5cded
treed05913133c528b4c0bcd7c498ea193d786921d10
parent7813e29760120d8e7ed0b1f4c91767cc809a2623
parent9a712c48fb8047c3ed833db7d47382eb072711d6
Merge commit 'origin/4.5' into 4.6