diff lisp/composite.el @ 109469:f2f8baec8e43

Merge from mainline.
author Katsumi Yamaoka <katsumi@flagship2>
date Mon, 19 Jul 2010 11:26:46 +0000
parents f7d37c2787ad
children 280c8ae2476d
line wrap: on
line diff