merge of 9d680ed94ee3622289ca2e365ea21a4fe475b650
authorMatthias Hentges <oe@hentges.net>
Sun, 12 Feb 2006 14:01:00 +0000 (14:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 12 Feb 2006 14:01:00 +0000 (14:01 +0000)
commit0d74a7e0914de459d712694d0e39dd6b436aed8d
treeda927c0d4bcd895a1304809c7c7ba91b13ae9a3b
parent2766ea08070fae6b438cd5a4ed7277e9ea17e835
parent6dcf5a170c84ec3fe59ba939b3d37bd8ae06012f
merge of 9d680ed94ee3622289ca2e365ea21a4fe475b650
     and a6f5fab8fef608fbada37e8e35857ada2aa931da