merge of e1fa4ab4db4576d220e90fd564d67769403c4742
authorKoen Kooi <koen@openembedded.org>
Mon, 8 May 2006 12:40:03 +0000 (12:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 May 2006 12:40:03 +0000 (12:40 +0000)
commit822baffe340d4267ea436fc7e197fd3b03b32825
tree906c44cfeb70c72aa8408ea48457b42e4cc3b259
parenta54992c6474a2c1afadcfd341146ecde8c59b058
parente00fec60c82357e56e7c5bc4f5e1314d0c236c8d
merge of e1fa4ab4db4576d220e90fd564d67769403c4742
     and ffddb058a7721edecad6b2a9d4d77ea9e2035e81