merge of 15e035df7fe4e06f903b284d02d9093184c03e78
authorKoen Kooi <koen@openembedded.org>
Thu, 21 Jul 2005 21:41:31 +0000 (21:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 21:41:31 +0000 (21:41 +0000)
commitf98a7c864e7637132fb52acb596d667bc77384ea
tree486d06fcc454215c38bfc5c2576c5c6cdd3a71b6
parent428662f8e6a428c7d9386caa8f226e403fdd2899
parent2167bc60b5196f9172fc95bbf99f89bc57b73189
merge of 15e035df7fe4e06f903b284d02d9093184c03e78
     and 1fac386ef241a1a19317045e669c3c4d038c2996