Merge remote-tracking branch 'ran/fixes'
authorDaniel Stone <daniel@fooishbar.org>
Mon, 5 Mar 2012 15:00:39 +0000 (15:00 +0000)
committerDaniel Stone <daniel@fooishbar.org>
Mon, 5 Mar 2012 15:00:39 +0000 (15:00 +0000)
1  2 
src/xkbcomp/expr.c
src/xkbcomp/keytypes.c

Simple merge
Simple merge