[fix patch conflict
John Meacham <john@repetae.net>**20090220213403
 Ignore-this: 4c588c0261319ad5b3b361cfd3d0e5b8
] hunk ./E/Annotate.hs 124
-    lp bnd lam tvr@(TVr { tvrIdent = n, tvrType = t}) e | n == 0  = do
+    lp lam tvr@(TVr { tvrIdent = n, tvrType = t}) e | n == emptyId  = do