* Fixlet to make the merge process easier
* Fixlet to make the merge process easier


git-svn-id: a3c907a151e3daf2f67d9e42cc547e25561306e0@496 76bb4867-1e22-0410-9289-e9e6e9b3b6f2

moriyoshi/libmbfl,moriyoshi/libmbfl,moriyoshi/libmbfl