Merge with tip.
authorTobias Markmann <tm@ayena.de>
Mon, 30 Nov 2009 22:25:10 +0000 (23:25 +0100)
committerTobias Markmann <tm@ayena.de>
Mon, 30 Nov 2009 22:25:10 +0000 (23:25 +0100)
commit905c3279189f21ad09432851c78e1ae1b0ddee6a
tree052db778333769cbf84a469d86c3933212573213
parentfd54730be51440c58f4281b3e641a22ff43e36ed
parent1667e0cbf8a68cc3b678c8304fe26789e35f1ee6
Merge with tip.