Merge branch 'master' of git+ssh://doffm@git.freedesktop.org/git/at-spi2/at-spi2...
authorMark Doffman <mdoff@silver-wind.(none)>
Thu, 22 Jan 2009 14:38:17 +0000 (14:38 +0000)
committerMark Doffman <mdoff@silver-wind.(none)>
Thu, 22 Jan 2009 14:38:17 +0000 (14:38 +0000)
commitdfc071dcf2f98f282616911cb0eb1636c93f3e77
tree2e5741237bd4c91ebb362f9cd0529ab1b5aa4b0c
parentb59dc5b9c3c2412fca31a86241d2540c30935833
parent2d2fdf89e9647f7a6fc1f14abd3c32ae48abc19a
Merge branch 'master' of git+ssh://doffm@git.freedesktop.org/git/at-spi2/at-spi2-core

Conflicts:

atk-adaptor/atk-dbus.c
atk-adaptor/tree.c
registryd/deviceeventcontroller.c
cspi/spi-main.c
registryd/deviceeventcontroller.c