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)
commit510590f52651569cdb510f4a568e1a18e637bd0e
tree4f0b645f5f433e3031147e30769bbcda260f41f9
parentceb44609ce092fb7d12bfcec333a816d4a1d02b2
parentabbaba6c3b15bf553c00740d2e2b6fbc73dfc81f
Rebasing master into fast-dbus-open-message

Conflicts:
debian/changelog