merge of b1dcd027693e6239eac9bebf42988acd618f1125
authorKoen Kooi <koen@openembedded.org>
Sun, 8 Jan 2006 00:51:43 +0000 (00:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jan 2006 00:51:43 +0000 (00:51 +0000)
commit6934ec6391878e8fc231dccbd00922a804706c0b
tree7d4eda8d916842a750e0c77e89e9e7f918a4b265
parentf2f9caadc01843d18f567cb85d072d1002b7fcb5
parent9dd0bd811c1e340d8854b19e8f398244e7cc0523
merge of b1dcd027693e6239eac9bebf42988acd618f1125
     and f7eb46be5e3e57b355a45440ee6c36224be527df