From 820f6e7af6cf0973559a9ab86c4d75b7c7d99182 Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Mon, 16 Jul 2007 10:18:52 +0000
Subject: Merge branch 'origin'

---
--
cgit v0.9.0.2