Merge branch 'master' into xi2

Conflicts:
	Xext/geext.c
	Xi/chdevcur.c
	Xi/extgrbdev.c
	Xi/xiproperty.c
	configure.ac
	dix/ptrveloc.c
	hw/xfree86/common/xf86Config.c
	mi/mipointer.h
	test/input.c
	xkb/xkb.c

1 files changed, 1 insertions, 1 deletions

diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
index 82d37d19f..9cb7061f3 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -507,7 +507,7 @@ unsigned		changed,tmp;
 	mc->changed|= changed;
     }
     if (interps!=ibuf)
-	_XkbFree(interps);
+	xfree(interps);
     return True;
 }