fix patch conflict
fix patch conflict

Ignore-this: 4c588c0261319ad5b3b361cfd3d0e5b8

darcs-hash:20090220213403-1a7c6-6db6249a74ffcc33ba767fe587e7eb216efc9e94

jimcrayne/jhc,jimcrayne/jhc,jimcrayne/jhc,jimcrayne/jhc