-
Daniel Molkentin authored
After conflict resolution. Change-Id: I888b0d110d20df88e1cb96424717e914a9a613de Reviewed-on: http://codereview.qt.nokia.com/1890 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
a994a6da