Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 31 Jan 2011 10:40:46 +0000 (12:40 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 31 Jan 2011 10:40:46 +0000 (12:40 +0200)
commite9146bfd7c33f480b888c586a5623153c36c7d7a
tree1163a22098ba05afc9da309713d765d61076114b
parentf3f2f56ca78e901909bb9e9660d96f931834ea6f
parent54813dbc66824b9c6015313fa5ea4aa7f7c48dab
Merge branch 'master' into harmattan