merge of 66c62d7fb075e5d0b30f7334eb98a0c3515f163c
authorKoen Kooi <koen@openembedded.org>
Thu, 11 May 2006 17:23:36 +0000 (17:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 May 2006 17:23:36 +0000 (17:23 +0000)
commitecba96371efd4dcfb197d60798ed8ffcc636cb87
tree0fbbbc2c4193fba96b0455f139afcb1664829056
parentbb2d992e4bbff033b0233d2f6076c7d90a3b6a2b
parenta66cc8b939a0a2e762521979bf6c16735c68088c
merge of 66c62d7fb075e5d0b30f7334eb98a0c3515f163c
     and 76e73da6705bd6599f3cb10085809f45b528bc8e