merge of 8b751e588b401c6381aeb1ce5afd7e1819ee5236
authorHolger Freyther <zecke@selfish.org>
Sun, 30 Apr 2006 23:13:02 +0000 (23:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Apr 2006 23:13:02 +0000 (23:13 +0000)
commit8f31bc47e69ad422a0d9c0bece22471d209b1eca
treedf07b288302897ba5e6a3e9b3c08efc201f96326
parentffc19dae9f5f43d393e69ca832869c654507df81
parentc183f854a5bbb54c436ca397821ff9e6e3e9e507
merge of 8b751e588b401c6381aeb1ce5afd7e1819ee5236
     and beca23d1fb2844c8e6092379104415279cb10fab