merge fix for bug #968828

diff --cc debian/changelog
index cbf5963623acb0c41c6f9d29af14b205becb9377,bda65c54365457bc1bacc0832eb1e0abd4816edf..9fe896f220b1f79dc4701f9e1b41743cfdb88ed8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -2,7 -2,8 +2,9 @@@ apt (0.8.16~exp12ubuntu7) UNRELEASED; u
  
    * clean up obsolete conffile /etc/apt/apt.conf.d/01ubuntu, which was
      dropped in maverick.
 -  * don't treat build-depends-indep as cross-build-dependencies; we should
 +  * Build-depend on gettext:any for cross-building support.
++  * Don't treat build-depends-indep as cross-build-dependencies; we should
+     always install the host arch versions.  LP: #968828.
  
   -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 24 Mar 2012 00:05:43 -0700