From: Kaj-Michael Lang <milang@onion.tal.org>
Date: Thu, 18 Oct 2007 23:00:29 +0000 (+0300)
Subject: Merge commit 'sbox/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02586ac5ff3b4e67ed5872c94423c96cc1665e83;p=mapper

Merge commit 'sbox/master'
---

02586ac5ff3b4e67ed5872c94423c96cc1665e83