* solve merge conflict
authorDirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Wed, 10 Jan 2007 19:08:25 +0000 (19:08 +0000)
committerDirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Wed, 10 Jan 2007 19:08:25 +0000 (19:08 +0000)
commit0ce3ddcd4a1ac63564189865aad7533c4908a3a0
treebca854377d7dd4ac3d1000ea0c8861a53a0afa8a
parentc33df99d174fb56b54e9b85b615dddc0a0656ec3
* solve merge conflict

pmo-trunk-r606
tests/check_text-utils.c