Merge branch 'master' into dbus-api
authorStef Walter <stef@memberwebs.com>
Sat, 26 Sep 2009 01:55:50 +0000 (01:55 +0000)
committerStef Walter <stef@memberwebs.com>
Sat, 26 Sep 2009 01:55:50 +0000 (01:55 +0000)
commitc103554f20afe85fcf68b8b0d567823544957b78
tree534fd2f50102079d0f2079347194e86fc1569d3d
parent27e9b4a7c12bf5e01a8e2cff14c8d53a5da7f056
parent3d0d8ef14fa345b2cb25312c2ac76b31ac9d6033
Merge branch 'master' into dbus-api