merge of 769a800deeefc4e439b5bc9c6cf9abd2a6dde254
authorRod Whitby <rod@whitby.id.au>
Tue, 2 Aug 2005 02:32:30 +0000 (02:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 02:32:30 +0000 (02:32 +0000)
commit33cc88b4e01f0eafed5c238b6c7f8d4847cde0aa
tree1f20271b217335751bb50792be15d4578a5444e6
parente579f52d968e28125fd5c216cbb92d1245d2050e
parentde400d6a449f2e4d0d995972236a4a4819eb2ff0
merge of 769a800deeefc4e439b5bc9c6cf9abd2a6dde254
     and 918d376ebc00bbed8c1aa2ba0e64dfde3039bb16