Merge branch 'master' into harmattan
authorSmita Srivastava <ext-smita.srivastava@nokia.com>
Tue, 17 Aug 2010 12:59:45 +0000 (15:59 +0300)
committerSmita Srivastava <ext-smita.srivastava@nokia.com>
Tue, 17 Aug 2010 12:59:45 +0000 (15:59 +0300)
commit593c7e145f1544e3af1bc92c016b6b344d1b0d2b
tree889ead1a8a33fcd9f58bf4d64dc5cd0b8ce5b5db
parent8f6a99d8da8e133f33d8782c857eb657a9db1020
parentc0cede85d07b087f1f31d2b902940134542395be
Merge branch 'master' into harmattan