Merge branch 'master' into harmattan harmattan/0.4-1
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Tue, 4 May 2010 10:58:31 +0000 (13:58 +0300)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Tue, 4 May 2010 10:58:31 +0000 (13:58 +0300)
commit0e6f56b811cfb05a7c02bec68bb8f64dd21f5ee8
treea85926d68824990d587d701695d43ce62c000616
parent44774146f9a5532d29978949228f0c378b5d068c
parentf6df27774fd0cf05381780065a6a499959ad5ada
Merge branch 'master' into harmattan

Conflicts:
configure.ac

Signed-off-by: Alexander Akimov <ext-alexander.akimov@nokia.com>
debian/changelog