Merge branch 'master' of git+ssh://doffm@git.freedesktop.org/git/at-spi2/at-spi2...
authorMark Doffman <mdoff@silver-wind.(none)>
Tue, 21 Apr 2009 16:22:42 +0000 (17:22 +0100)
committerMark Doffman <mdoff@silver-wind.(none)>
Tue, 21 Apr 2009 16:22:42 +0000 (17:22 +0100)
commit180f7315a0ddab77016d532c6458d40358f8553b
tree594260a86b286b4114d0765c17788387abbba19a
parent44b8c011166f4a17012400fa32bfbe04d8ccde2c
parent02fbca369645d0e67401065e3bd795492487c639
Merge branch 'master' of git+ssh://doffm@git.freedesktop.org/git/at-spi2/at-spi2-core

Conflicts:

pyatspi/base.py
spi-common/spi-dbus.h