merge of 20d82b867694bc656456a80553cb61e3496c6971
authorMichael Lauer <mickey@vanille-media.de>
Thu, 11 May 2006 16:49:14 +0000 (16:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 May 2006 16:49:14 +0000 (16:49 +0000)
commit01863d57ffb035ad0cc64aa273d6a13d28bae787
treeb39b948968c861a1f5ddb6e980f26261392381de
parent8c23f19e75f16952608b1eaf9127823807a24bcf
parent563dc7a4e0cced9d519412e28db9ac3d686f1c3a
merge of 20d82b867694bc656456a80553cb61e3496c6971
     and 3218f01f2326060a12ef6708b1b8a120b220d5a9