Merge branch 'master' into dbus-api
authorStef Walter <stef@memberwebs.com>
Sat, 27 Jun 2009 19:44:51 +0000 (19:44 +0000)
committerStef Walter <stef@memberwebs.com>
Sat, 27 Jun 2009 19:44:51 +0000 (19:44 +0000)
commit8b9293d26624517dc66c70c32462184957652949
tree8d9d75d75d5d9f7954a423e345ef8315af8a7ad1
parent921110af3f86b0146269af98230add0eb02e759e
parentf62c011930cec03c662a71d56c6fa4ffb0f92fc3
Merge branch 'master' into dbus-api