Merge branch 'master' into dbus-api
authorStef Walter <stef@memberwebs.com>
Sat, 10 Oct 2009 15:06:42 +0000 (15:06 +0000)
committerStef Walter <stef@memberwebs.com>
Sat, 10 Oct 2009 15:06:42 +0000 (15:06 +0000)
commitb9168f4cb5c52cc160d6ef7e68ebc987d0f92452
tree5d28d7cbb60915ee33ca94ef27e4de1d84cec59f
parenta1e8b839a9487bac03d25ed5257e5334fb2027de
parent8a14f5930839daa7d21b42774c4b2ab068dbc919
Merge branch 'master' into dbus-api