Handle merge conflict related to bug #21
Handle merge conflict related to bug #21

darcs-hash:20081122211125-fbb9b-53e9c1e263953b5ab669d93f370a8b3ac855e154

llelf/language-c,llelf/language-c,llelf/language-c