From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Fri, 19 Dec 2008 22:30:30 +0000 (+1300)
Subject: Merge branch 'release-0.9' into packaging
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fpackaging;p=mythtv-status.git

Merge branch 'release-0.9' into packaging

Conflicts:

	Makefile
---

a3ca2a4a32853b8f168379f0ca640b6549d173fa