merge of 214b4c4e7d773cc8d94d28db3d1f88d20f67c976
authorKoen Kooi <koen@openembedded.org>
Fri, 30 Jun 2006 09:10:01 +0000 (09:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Jun 2006 09:10:01 +0000 (09:10 +0000)
commitb2260848cb4198f389ff0a4ae61efafe9bf60d39
tree746c41333cff3aabb2fafa4b8678c73c5579d20f
parent9a83e6e9de1e231a0e5afd8d6b21c924cbc8889f
parent688eb57df4e3122f39459325a54cb3d897bc143b
merge of 214b4c4e7d773cc8d94d28db3d1f88d20f67c976
     and 75ab5e8a308a9e33d98460b70c311d02f6b50737