merge of 5d00faa43da50d29b85f6526e4e7910ddc4c2894
authorMatthias Hentges <oe@hentges.net>
Thu, 23 Feb 2006 12:34:37 +0000 (12:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 23 Feb 2006 12:34:37 +0000 (12:34 +0000)
commitae019d8a5ac713a25768b76f4cb0af5c362b9cdf
treed3058590bc1c4161e0fa8103c02b88bb32597402
parentf8955e0dc7898ad33000cd50f92b3ea15e84169e
parent6a44a40bb78b471889cc33b8624574e132a3213f
merge of 5d00faa43da50d29b85f6526e4e7910ddc4c2894
     and 5dc03a4f61ff65b8e7255e287dd9ead584c6c81f