From 82862af917a482177c3375054e2eaae5d24b7b43 2008-03-19 14:38:59
From: Ville M. Vainio <vivainio@gmail.com>
Date: 2008-03-19 14:38:59
Subject: [PATCH] null merge (?!?)

---