Automated merge.

diff --combined ChangeLog
index 4d92ee2f3b9690f3ce3b3c33a10a2e8df9160751,534a92c63b8900aa514f4e89cd1cc589c6a578ce..deb56df9457c19734ba9372558bcaaa0c6657aa0
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,13 +1,16 @@@
+ 2008-02-06  Micah Cowan  <micah@cowan.name>
+ 
+       * configure.ac (AC_CHECK_FUNCS): Added check for mbtowc.
+       * po/be.po: Added from the TP.
+ 
  2008-02-03  Micah Cowan  <micah@cowan.name>
  
        * configure.in: Add checks for wchar.h, wcwidth function (to
        support column-counting in progress.c).
        * NEWS: Added line for 1.11.1.
 +      * util/README, util/Makefile.am, util/trunc.c: Added a small
 +      utility program to create files of arbitrary size (useful for
 +      testing certain situations with --continue).
  
  2008-01-31  Micah Cowan  <micah@cowan.name>