From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Sat, 12 Jan 2008 04:04:31 +0000 (+1300)
Subject: Merge branch 'release-0.6'
X-Git-Tag: 0.7.0~5
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=780a43238df49dad9e8338ecbe94d0ce17b99364;p=mythtv-status.git

Merge branch 'release-0.6'
---

780a43238df49dad9e8338ecbe94d0ce17b99364