From 284a8c00c55efd3ba7e8f86c579928056b5260fd Mon Sep 17 00:00:00 2001
From: James Cameron <quozl@laptop.org>
Date: Mon, 20 Jun 2011 00:41:58 +0000
Subject: Merge ../log-fixes-quozl

---
--
cgit v0.9.1