[upstream] Upgrade upstream master 20130805

Signed-off-by: Matti Kosola <matti.kosola@jollamobile.com>
[packaging] Add tests package including tests.xml

Signed-off-by: Matti Kosola <matti.kosola@jollamobile.com>