Merge branch 'master' into harmattan
authorSimjees <siabraha@mulimani-desktop.(none)>
Tue, 10 May 2011 05:15:16 +0000 (10:45 +0530)
committerSimjees <siabraha@mulimani-desktop.(none)>
Tue, 10 May 2011 05:15:16 +0000 (10:45 +0530)
commit9df0f3ec5ef899124f536de11ff53d95fe0f203d
tree0b2a8d5d29303d973dc30aa853c086da762d99f2
parent0cb1b8d1225a7ff8704f09c4ae20c13fdf645f99
parent7e98558ce3ee6b80087e1b345d24e7768f402101
Merge branch 'master' into harmattan