From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Sun, 2 Dec 2007 00:30:32 +0000 (+1300)
Subject: Merge branch 'release-0.5'
X-Git-Tag: 0.6.0~20
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7823657e3be19f87254a554bcda78f59d7fbf508;p=mythtv-status.git

Merge branch 'release-0.5'
---

7823657e3be19f87254a554bcda78f59d7fbf508