merge of 975b96916690358f4a6cab8fbb7308fce112d311
authorJamie Lenehan <lenehan@twibble.org>
Mon, 3 Jul 2006 03:29:47 +0000 (03:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 03:29:47 +0000 (03:29 +0000)
commit314731d7c422279c41de7b7c1921497226237498
tree057785a345ea444287c21562de5110695589ba01
parent0634f7bc2185bf1c2caac4eee98473af8b569048
parent660a0feb66e64979ec74a6e58d0b8d190bd4e5eb
merge of 975b96916690358f4a6cab8fbb7308fce112d311
     and b97ad46b88a01ddecefed222491f15a9b1ba45c9