merge of '2ae6ecf2677fa2b9a53f45b824b830304af50db8'
authorKoen Kooi <koen@openembedded.org>
Tue, 17 Oct 2006 18:21:16 +0000 (18:21 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 17 Oct 2006 18:21:16 +0000 (18:21 +0000)
commit156527c87c0bee9fef81e1df940a790218ae7c52
treeedc5e0ccb2ac56d383b0f8e9dc08ed92dffa4861
parent811be5135e2486a4b45c4491540abf137b284dce
parentdabb152c4a2af97620abf527ef79c8f8b591420a
Merge ... '2ae6ecf2677fa2b9a53f45b824b830304af50db8'
     and 'ef1738131018813b36ed568f7299f38f6f22f3a2'