tree 172f4cfa0a85fb1587a789b07d29552114c6a7f0
parent bdb71a41caa9ffed2e3207736c21fffbc2007670
parent e8c80638abc99928dba9ac832589749a531e2e21
author Junio C Hamano <junkio@cox.net> 1123705208 -0700
committer Junio C Hamano <junkio@cox.net> 1123705208 -0700

Merge with master.

This merges commit
    e8c80638abc99928dba9ac832589749a531e2e21
from master into our head commit
    bdb71a41caa9ffed2e3207736c21fffbc2007670

Sincerely,
    jit-merge command.