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)
     and 7adb1db79c0e0fca09a5d25db51f5e61e1b9f043


Trivial merge