Merge branch 'ipc'
authorAndre <maan@p133.(none)>
Tue, 21 Feb 2006 08:20:30 +0000 (09:20 +0100)
committerAndre <maan@p133.(none)>
Tue, 21 Feb 2006 08:20:30 +0000 (09:20 +0100)
commit730cb7dd464355316ee30846a3d2e91f22b4f7e1
tree7fc26be4f3d9e896cf9ef29111a634e83bedf750
parent8db6cb34ef06dff8aaf6f4fa4189151216354c9a
parentbad57eee70cdca87e8ba1af08d4e2ef6d2878620
Merge branch 'ipc'

Conflicts:

configure.ac
error.h

Fix these conflicts.
configure.ac
error.h