merge trunk rev : 25663 and 25664 to 0.3.1 branch - update freetype, take care of...
authorMagnus Olsen <magnus@greatlord.com>
Wed, 31 Jan 2007 17:07:19 +0000 (17:07 +0000)
committerMagnus Olsen <magnus@greatlord.com>
Wed, 31 Jan 2007 17:07:19 +0000 (17:07 +0000)
svn path=/branches/ros-branch-0_3_1/; revision=25666


Trivial merge