merge of 28158d679a65dc8b24fcdb891cf73aa3981add9a
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 8 Jul 2006 18:51:38 +0000 (18:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Jul 2006 18:51:38 +0000 (18:51 +0000)
commit97e21e1abee845bb54ad536eafb0a742ca28d229
treec8192797cb1e1591b411cb3a9cbd01240f631932
parentd160eca8a1eec85bbaffcfca8c2fab12c71699df
parent63bc7f46c008b7b27fa4d93c7485e0e8e6b9c2bd
merge of 28158d679a65dc8b24fcdb891cf73aa3981add9a
     and acafceaa6274c3052621ed2a6eb47f89e7c7ee75