Merge branch 'master' into dbus-api
authorStef Walter <stef@memberwebs.com>
Mon, 9 Nov 2009 22:26:04 +0000 (22:26 +0000)
committerStef Walter <stef@memberwebs.com>
Mon, 9 Nov 2009 22:26:04 +0000 (22:26 +0000)
commit2b22098088910b152a131c586907eef42a5880bb
tree77a6fc600565ac107cf1a79e4c1e817a3aa2a229
parent55bed6d2eda2019ab9419c8f951ed8c0a96e6a36
parentb0534f6ba7a2c2394c0c20158b391ed074576ea0
Merge branch 'master' into dbus-api