Merge commit 'dbb1413589512574519abcf52a9a7127ddc7844b' into upstream-merge
commit18efa4c3abdb6ee932a637900b66c146c3df958d
authorMarcelo Tosatti <mtosatti@redhat.com>
Fri, 22 Oct 2010 13:57:45 +0000 (22 11:57 -0200)
committerMarcelo Tosatti <mtosatti@redhat.com>
Fri, 22 Oct 2010 13:57:45 +0000 (22 11:57 -0200)
tree19ee0fada84cb6972115ec95409d489f8e887ce2
parent03dad62368300e9f287ca0cdc5833a5f8737ef82
parentdbb1413589512574519abcf52a9a7127ddc7844b
Merge commit 'dbb1413589512574519abcf52a9a7127ddc7844b' into upstream-merge

* commit 'dbb1413589512574519abcf52a9a7127ddc7844b':
  curses: Fix control-{@[\]^_} and ESC

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>