diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 16:35:39 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 16:35:39 +0100 |
| commit | 52abe8d77cbfed9c91a9cae7ed0a7e60aaf50b34 (patch) | |
| tree | 7f3b125c3485041c0488adf60390a1fdb230bf6c | |
| parent | 9eaf1493b3c777d688ad992b9ecedd1cc18cf147 (diff) | |
| parent | ce5b19f9784561fb506bc564082e7a3d888a0c90 (diff) | |
Merge commit 'origin/org.openembedded.dev' into holger/openmoko-merges
Conflicts:
packages/tasks/task-openmoko-feed.bb
