Merge branch 'text'
commit1b9a8c6a059de6f34aa218dad0859a3181000a04
authorPatrick Guimond <patg@patg.homeunix.org>
Sat, 17 Mar 2007 20:41:43 +0000 (17 16:41 -0400)
committerPatrick Guimond <patg@patg.homeunix.org>
Sat, 17 Mar 2007 20:41:43 +0000 (17 16:41 -0400)
treedb730b1ffb20d412c96e2729af432eb2bd8da8d0
parentfc845dbdac1ed101cae302db519e297c314e6fdc
parent6ddab76f01cefb0ddf1dd8c3e293908ca0a4f134
Merge branch 'text'