Merge branch 'master' into dbus-api
authorStef Walter <stef@memberwebs.com>
Tue, 24 Nov 2009 16:26:06 +0000 (16:26 +0000)
committerStef Walter <stef@memberwebs.com>
Tue, 24 Nov 2009 16:26:06 +0000 (16:26 +0000)
commit9d3381e2625da2b42c33c927eb0154da6dd09bdd
treedac3d66832d20498dbec3f88f5d64b90db25e22f
parentf196f4b6c4addf453c5ea171d1c2991b14b59a62
parentb0534f6ba7a2c2394c0c20158b391ed074576ea0
Merge branch 'master' into dbus-api