From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Thu, 30 Oct 2008 01:13:45 +0000 (+1300)
Subject: Merge branch 'release-0.9.0' into release-0.9
X-Git-Tag: 0.9.2~16
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c80b6b5f5ad977a2c5310e4e168fa7e1cb2ea43e;p=mythtv-status.git

Merge branch 'release-0.9.0' into release-0.9

Conflicts:

	debian/changelog
---

c80b6b5f5ad977a2c5310e4e168fa7e1cb2ea43e