Merge with tip.
authorTobias Markmann <tm@ayena.de>
Tue, 1 Dec 2009 19:55:32 +0000 (20:55 +0100)
committerTobias Markmann <tm@ayena.de>
Tue, 1 Dec 2009 19:55:32 +0000 (20:55 +0100)
commit826bfa08856c6365d183c07bfadd4056498e046d
treeba27bb245d6f8da22c4318f9aa4c563c62f6ba99
parente31e0452e32ee8cd820f0cf07a200f864109c36f
parent231307a31cf350b7709faaa90f643db6792865dd
Merge with tip.