Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Wed, 15 Feb 2012 10:09:33 +0000 (12:09 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Wed, 15 Feb 2012 10:09:33 +0000 (12:09 +0200)
commitfb35f84e2f07bf4c881a1b368b583efde5f19b36
tree293a68be76a91dade1ae2437f15ca64c5b5b64ca
parentd67f268ed6f473e61fac587dff9c502d02997b77
parent8a590230a0f4c232bbac94bfff054c441d59eb9e
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri