Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 26 Jul 2011 11:08:00 +0000 (14:08 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 26 Jul 2011 11:08:00 +0000 (14:08 +0300)
commit903ef33b9f1c612e84b11c8bb2327675c39bb72f
tree283cef66b8cc4645a4f333bafe762f2f7d75bf74
parent8b0d46b7691d3c4214d2a48ea035aa644610751a
parent2a8c7b6301837259480aa5ca5cfd3aa404d3e5ea
Merge branch 'master' into harmattan

Conflicts:
configure.ac
configure.ac