merge conflicts harmattan/0.64
authorsmita <smita@smita-laptop.(none)>
Thu, 27 Jan 2011 09:02:28 +0000 (11:02 +0200)
committersmita <smita@smita-laptop.(none)>
Thu, 27 Jan 2011 09:02:28 +0000 (11:02 +0200)
commita704200ece5f4ebf2fd0bbc5c4e64f2014a57816
treee14c84060b225deee39e20da5169f1424978aafb
parentb6379f0098efcdd5d8c0e72ebee19c3cb7fd3f20
parent0da7c18a323fcf7b85f9607d4a41f50649c852f6
merge conflicts
configure.ac