Merge branch 'release-0.9.0' into release-0.9

Conflicts:

	debian/changelog

diff --cc debian/changelog
index cb98dd259b8968e07defc19fa341111d50846fde,3497ec102a91b7fa49e8c9ea208fe4c78c43f72f..ba9b41388274c20f45b4bb3e5a1cdcec6de51f7c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
 +mythtv-status (0.9.1-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Andrew Ruthven <andrew@etc.gen.nz>  Thu, 30 Oct 2008 14:13:50 +1300
 +
+ mythtv-status (0.9.0-6) unstable; urgency=low
+ 
+   * Swedish debconf translation from Martin Bagge (Closes: #506599).
+   * Add a status to the init.d file.
+ 
+  -- Andrew Ruthven <andrew@etc.gen.nz>  Sun, 23 Nov 2008 13:29:52 +1300
+ 
  mythtv-status (0.9.0-5) unstable; urgency=medium
  
    * Update init.d with feedback from Adeodato Simó.