Merge branch 'master' into harmattan
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 10 Feb 2012 13:41:39 +0000 (15:41 +0200)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 10 Feb 2012 13:41:39 +0000 (15:41 +0200)
commitb4ad3ea771292bcc1cf54f88e9db7807f2d8a97e
tree610cf52ccba6874a248bac0578b676b3132c6f4e
parentf77d94dc151ab0c5683b4ed4bbc44adc6a907dce
parentb2a7001619193dca7d86056ac9349f30903c770b
Merge branch 'master' into harmattan