Merge branch 'upstream-kwiml' into update-KWIML

This commit is contained in:
Brad King 2012-03-20 15:51:11 -04:00
commit 86c4c93888