tree ff14de669a0f349edc2e3069006b5d30cfac7f0c
parent 7746bd896cad483ae5f32ce930a60a2432ba53d2
author Holger Hans Peter Freyther <zecke@selfish.org> 1276600452 +0800
committer Holger Hans Peter Freyther <zecke@selfish.org> 1276604652 +0800

nat: Redo a merge with master that got lost on the cherry-pick