Merge branch 'master' into my-osx
authormaan <maan@Gumbo.local>
Sun, 11 Jun 2006 20:57:48 +0000 (22:57 +0200)
committermaan <maan@Gumbo.local>
Sun, 11 Jun 2006 20:57:48 +0000 (22:57 +0200)
commite7a40750746aa95f665629e0453e962d55897e36
tree6e6041c628e6ce330838452ada5f066a68afb1a0
parentdfe23e249eb57ab18867be6efd8749b84aa79b73
parente1dfa207b2f03e2c06ccfdc6c1c68598703ba4d1
Merge branch 'master' into my-osx

Fix Conflicts:

error.h
configure.ac
error.h