merge of 253b3416d6485c95aa1653ae4d5b49a707d9fbe6
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 5 Feb 2006 01:01:54 +0000 (01:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 01:01:54 +0000 (01:01 +0000)
commita1e5ad6c67eaaf22b6223f3f3c2633177d77f4da
treeedf3a86d536491c46247a95e76c1910de359e9ae
parent0c89a054a6e3279f935d0fd1b1a29d5da3b2089d
parentf5c58cb11d713fe6fabccc5265ba461600b0971c
merge of 253b3416d6485c95aa1653ae4d5b49a707d9fbe6
     and 9b98e6390444bf96f5e5fa74d89ff83c0083a833