Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master
authorRohan McGovern <rohan.mcgovern@nokia.com>
Mon, 5 Mar 2012 03:53:58 +0000 (04:53 +0100)
committerQt by Nokia <qt-info@nokia.com>
Mon, 5 Mar 2012 04:31:06 +0000 (05:31 +0100)
commit33f82d5b4e24885e4c6cad0a44e058b44d916e14
tree8b4a73bc421defb2ae2aff7f9879736a207b4f16
parentd423fd0975569928faeafad28702750407e889ee
parent96232be1466e8c059c270b611ce7c32997ff60a9
Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master