tree 3bcd25bc4875a93e4120512879dc782cb0eb41bd
parent aad68b5ef8ca6c6e9e932fca0a3e7ef68f0e050d
author Holger Hans Peter Freyther <zecke@selfish.org> 1276599978 +0800
committer Holger Hans Peter Freyther <zecke@selfish.org> 1276604647 +0800

nat: Redo a merge with master that happend at this time.