From: Steinar H. Gunderson <sesse@rietz>
Date: Sun, 17 Jun 2007 15:59:20 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=commitdiff_plain;h=ba928af3f693d3d4fc348c4d1395967fbddd04b1

Merge from mainline.
---

ba928af3f693d3d4fc348c4d1395967fbddd04b1