From: Pavel Labath <pavelo@centrum.sk>
Date: Wed, 3 Mar 2010 10:59:15 +0000 (+0100)
Subject: Merge branch '1.8.0' into 1.8.1
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=e639ad45aeeaf43d5d2565d5eaee1ecc8813248c;p=monky

Merge branch '1.8.0' into 1.8.1

Conflicts:
	configure.ac.in
---

e639ad45aeeaf43d5d2565d5eaee1ecc8813248c