Merge branch 'master' into harmattan harmattan/0.119-1
authorSimjees <siabraha@mulimani-desktop.(none)>
Mon, 18 Apr 2011 07:03:52 +0000 (12:33 +0530)
committerSimjees <siabraha@mulimani-desktop.(none)>
Mon, 18 Apr 2011 07:03:52 +0000 (12:33 +0530)
commit097b9338e9fcfaf94fa7b1ce041bfe903087bb44
treefef7b176cf7e6d5cadfd7a9698025526a1c7729a
parent92272e51b8cd469517a17f2a29902a3c1c83efb9
parent48ebeac49035c55a02d8b4c79e947ff7a7395b36
Merge branch 'master' into harmattan

Conflicts:

common-vars.pri
debian/changelog