From 2e7bf3278c3e13baaa32c7ec8c2b3fdc4780a080 Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Sun, 09 Dec 2007 22:10:49 +0000
Subject: Merge branch 'next' into devel/xri

---
(limited to 'test')

--
cgit v0.9.0.2