merge trunk
authorKenichi Handa <handa@etlken>
Thu, 22 Apr 2010 04:07:11 +0000 (13:07 +0900)
committerKenichi Handa <handa@etlken>
Thu, 22 Apr 2010 04:07:11 +0000 (13:07 +0900)
commit8404c468113fb4189fe7d884959172987d650b78
treefd35e50cc730d82dc565834b7fe0801543c9b87a
parentece33a6ecbfdad78c9ed21956efd68afd8e0bde0
parent6776e4c4b4cb55ef865601cb7ce5130468f460d9
merge trunk