| commit | dd03c6135f91df6d5d9e71de1487520dc3345742 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 21 12:59:04 2009 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 21 12:59:04 2009 -0700 |
| tree | c4948e1ca876b218b8c50abd6171ad2be10396cd | |
| parent | bfcfb7eec61bd196cfd91f7b2c5715751308c048 [diff] | |
| parent | 081a136d259c02b2ab8ba773c38e404f7b3c3de4 [diff] |
resolved conflicts for merge of 081a136d to eclair