merge conflicts smita_avatar 3
authorsmita <smita@smita.apac.nokia.com>
Wed, 20 Jul 2011 05:41:38 +0000 (08:41 +0300)
committersmita <smita@smita.apac.nokia.com>
Wed, 20 Jul 2011 05:41:38 +0000 (08:41 +0300)
commit399425e3ae3da2b015ceed91e2ba755a8dab36be
tree91935e52f15f08c4517c8cf73c4b39596bafcfe3
parentb94f262572eee4eedf32b8827d1793c7c955d6f9
parenta513521852e9ca710b65566f28a3981cb6a31cec
merge conflicts