merge of 9c951cf8a21c82b4eabd9def7e39018b72a58207
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Sat, 1 Jul 2006 17:39:27 +0000 (17:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 1 Jul 2006 17:39:27 +0000 (17:39 +0000)
commit5770cef667b87b1565d33331521c55a8c88c083c
tree911fd8c231623f9a2d457e35cddbf3e9a325f23b
parent0f9202fb5e73731751b6aef3411f966c2756f1d0
parentd30b20595c8c682f10a1ab2ef6ec44b87583c561
merge of 9c951cf8a21c82b4eabd9def7e39018b72a58207
     and d50b000eb72487fd8f053761eb15160cf5e56976