Merge branch 'master' into dbus-api
authorStefan Walter <stef@ws.local>
Sun, 15 Nov 2009 16:10:04 +0000 (16:10 +0000)
committerStefan Walter <stef@ws.local>
Sun, 15 Nov 2009 16:10:04 +0000 (16:10 +0000)
commit27f2da1e8f4c6376673893b91011e8a46ea0f499
tree807436aa71d2612ba0f80bdb7d301c2dec5188c4
parent2695ec262290aababbcf5bd2f4c0949140f17dd9
parentb0534f6ba7a2c2394c0c20158b391ed074576ea0
Merge branch 'master' into dbus-api