merge conflicts pr1.2fixes
authorsmita <smita@smita.apac.nokia.com>
Fri, 2 Sep 2011 09:05:17 +0000 (12:05 +0300)
committersmita <smita@smita.apac.nokia.com>
Fri, 2 Sep 2011 09:05:17 +0000 (12:05 +0300)
commit3572b76b311d29969e19b698c828484a69bd5750
tree322aaf24c284ed0243005939eab15147e344905f
parent6e95c242b8ef183ec2c560d15e3fd7a9f0dec8d4
parent40d396b24c02a3f7a2f53b5efdf77d8df1ce1f7d
merge conflicts