merge of 44f2e80d1a5751741be6c6f1fd4928f3d53a32b2
authorKoen Kooi <koen@openembedded.org>
Sat, 1 Jul 2006 21:40:18 +0000 (21:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 1 Jul 2006 21:40:18 +0000 (21:40 +0000)
commit976e85862386b35882ac202796be3ffec2247737
tree357a0fafc2ea8c14df847bcba19fc6b6ea0c2486
parent4d95dd19f5a8a5683efd5c563d1eb1b48a4e1238
parent80536b3d65d2cbc8677242aa341298b19064c87c
merge of 44f2e80d1a5751741be6c6f1fd4928f3d53a32b2
     and 7adb1db79c0e0fca09a5d25db51f5e61e1b9f043