merge of f0d5a9cad37301a7b5305db122880b04aa6a20b7
authorRod Whitby <rod@whitby.id.au>
Tue, 25 Apr 2006 22:44:46 +0000 (22:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Apr 2006 22:44:46 +0000 (22:44 +0000)
commit1cf22f7e5a6b828b374463d4c22e0213f88e703d
tree39e60bc985ab264febbf027a19a4440ef2fe3652
parent426a27dea384b826ff32915ea8c963f9dcfe60b8
parent3d8ff3fad84c5b270f8b5a74f995b71ce85a1306
merge of f0d5a9cad37301a7b5305db122880b04aa6a20b7
     and fd10e7e7e2425da1310503d4f79c27673a6294f0