| commit | c90e4fc75eec001eb123b08954ac4fcfca28f366 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Dec 10 17:53:27 2009 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Dec 10 17:53:27 2009 -0800 |
| tree | 104ff11f3a4d220f6da0d61b5e06246e5a29acf2 | |
| parent | 9c006db35322fef5a11be0c4041b3ab6614ecceb [diff] | |
| parent | 0ef402831af32f63e6e48195d37c2cdbf6943d5d [diff] |
resolved conflicts for merge of ce307f88 to eclair-mr2