OSDN Git Service

resolved conflicts for merge of f476c480 to eclair-mr2
authorFred Quintana <fredq@google.com>
Thu, 5 Nov 2009 19:46:11 +0000 (11:46 -0800)
committerFred Quintana <fredq@google.com>
Thu, 5 Nov 2009 19:46:11 +0000 (11:46 -0800)
commit3266c5f125be34aae0f50e0e3397b14d9a603ad0
treed1a8f1d0cf879660eddb8a8d6c0269d4d459822f
parent195a507fc364d249c8ff4d3cd86dea00f383b0aa
parentf476c480cdf41be9989c3cfbc3b92038d11e7569
resolved conflicts for merge of f476c480 to eclair-mr2