Merge 'maint' updates in
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2010 00:09:20 +0000 (17:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2010 00:09:31 +0000 (17:09 -0700)
commit3c0ae1bd729284d6cdb7a4bc3cb3d8cfe9fd08c1
treef0c3bfc1011c4b71e3ddda170e6bc6c617fa5023
parent6068cdcc832040ac644c56953be0670bb09afd12
parent45a0ee116348d1b36756fe47d338713c06b918ad
Merge 'maint' updates in

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/notes.c