Merge branch 'release-0.10' into release-0.10-debian-squeeze

Conflicts:
	debian/changelog

diff --cc Makefile
Simple merge

diff --cc debian/changelog
index 938ccb4303327f305ad23fc660e162eb57e3653d,411c53bdbf2d6a39317585ed7aef54d559a73d00..ab4d59f90787bbcb22164c7eecca10dcc92c795e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,24 +1,24 @@@
 -mythtv-status (0.10.2-2) unstable; urgency=low
++mythtv-status (0.10.2-2~bpo-squeeze1) squeeze; urgency=low
+ 
+   * Handle a stale temp file more gracefully (Closes: #681684) 
+   * base-files 6.11 in Wheezy uses /var/run/motd.dynamic (Closes: #688034) 
+ 
+  -- Andrew Ruthven <andrew@etc.gen.nz>  Tue, 02 Oct 2012 21:50:10 +1300
+ 
+ mythtv-status (0.10.2-1) unstable; urgency=low
+ 
+   * New upstream release. (Closes: #680358)
+   * Danish debconf translation from Joe Dalton. (Closes: #680372)
+ 
+  -- Andrew Ruthven <andrew@etc.gen.nz>  Sat, 07 Jul 2012 16:32:46 +1200
+ 
+ mythtv-status (0.10.1-1) unstable; urgency=low
+ 
+   * New upstream release.
+ 
+  -- Andrew Ruthven <andrew@etc.gen.nz>  Thu, 14 Jun 2012 23:06:11 +1200
+ 
 -mythtv-status (0.10.0-1) unstable; urgency=low
 +mythtv-status (0.10.0-1~bpo-squeeze1) unstable; urgency=low
  
    * New upstream release.
    * Make sure we clean up /etc/default/mythtv-status on purge (Closes: #656224)