Merge branch '4.6-s60' into 4.7-s60
authoraxis <qt-info@nokia.com>
Fri, 10 Sep 2010 09:52:39 +0000 (11:52 +0200)
committeraxis <qt-info@nokia.com>
Fri, 10 Sep 2010 09:52:39 +0000 (11:52 +0200)
commit58c01e23ea156369b7a8b31f34e3bd9b683a22a0
tree4df602ce7e0d4911db31e36af6d1deee0f327067
parent5cef786a651c675d3428060a19bfd9d9ecee6083
parent1ecd2d460896959cf3c5654f4cef7e4d3c8f5cf6
Merge branch '4.6-s60' into 4.7-s60