Merge branch 'dbus-api'
authorStef Walter <stef@memberwebs.com>
Mon, 14 Dec 2009 15:00:29 +0000 (15:00 +0000)
committerStef Walter <stef@memberwebs.com>
Mon, 14 Dec 2009 15:00:29 +0000 (15:00 +0000)
commitb9f4ff74fe80c8bda551e6e8fb33e467db74a726
tree2a814a8aab4f4d98550d3b5fd9742842d4574b31
parentbfb0344ede07aa05f14a1d38c82d806b8fc1af29
parent6c3dbdff0e3efa9e49831fda461168f0b87afa85
Merge branch 'dbus-api'