Merge branch 'crack.137880'
authormadam <adam@nightfish.research.nokia.com>
Wed, 7 Jul 2010 11:54:02 +0000 (14:54 +0300)
committermadam <adam@nightfish.research.nokia.com>
Wed, 7 Jul 2010 11:54:02 +0000 (14:54 +0300)
commit59397f7190564d8de9159a3e633bf76e88954d9b
treef99bf624209301a0e038075481201f1bc727a656
parentb2be23942bc8317ef23f79fe873c772879169363
parent77d53e9f1705cca2c28ddb00c012266438375da0
Merge branch 'crack.137880'

Conflicts:

ChangeLog
ChangeLog