merge of 0e127465aab36f6067412b4ae8dc1d143975a5d2
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 26 Aug 2005 10:14:00 +0000 (10:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 Aug 2005 10:14:00 +0000 (10:14 +0000)
commit8acf15a3b7aff17ec888c476cd2deeb2271e5124
treec709aa61e00ef9d57bfd427c4f5c1a87f6d334e2
parentad3b54a8385f73950e943c1e1a975d7823c05abf
parentb18d365c729f7af14552950135cf6d9abd47203d
merge of 0e127465aab36f6067412b4ae8dc1d143975a5d2
     and 13f41f22b28195db22a3edccf3d65864ffb89f46