diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-09 19:21:24 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-09 19:21:24 +0000 |
| commit | 86d1d8cd13335c4dca722ac398c69a105fc9ac8f (patch) | |
| tree | bf7433f99e0fc0ffbdbddd24c2201d21a9dd60e8 | |
| parent | 249a5476b2d2ec15e71b126bb02bc885b29604ee (diff) | |
| parent | 45e1048fb2a2fc047c8a903966ca5cc9d1e03112 (diff) | |
explicit_merge of '93b8d4a095a60dfe2b4b6e82f4ce68721a1d4f11'
and 'd5130c6d17c31fa91dee51b0074c7e5e8c87717c'
using ancestor ''
to branch 'org.openembedded.dev'