Rebasing master into fast-dbus-open-message fast-dbus-open-message
authorJose Dapena Paz <jdapena@igalia.com>
Tue, 16 Jun 2009 16:09:43 +0000 (18:09 +0200)
committerJose Dapena Paz <jdapena@igalia.com>
Tue, 16 Jun 2009 16:09:43 +0000 (18:09 +0200)
Conflicts:
debian/changelog


Trivial merge