Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Wed, 10 Nov 2010 10:24:28 +0000 (12:24 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Wed, 10 Nov 2010 10:24:28 +0000 (12:24 +0200)
commit6d7df76e86f85facbe5564705300917cb1dafe81
tree6d81940ae9e3b98ed043d5bd80b491afff1d5c16
parent97acb96f8e1ede61a681d54d611800c48c542131
parent697e186fb8b7dae0a0c8315471368d33af38ca05
Merge branch 'master' into harmattan