From: Bdale Garbee <bdale@gag.com>
Date: Mon, 2 Nov 2009 03:23:39 +0000 (-0700)
Subject: Merge commit 'upstream/3.12'
X-Git-Tag: debian/3.12-1~6
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=85afa10b690b7c58892e90e10c929d06c7e0afa5;p=debian%2Felilo

Merge commit 'upstream/3.12'
---

85afa10b690b7c58892e90e10c929d06c7e0afa5