merge of 0e4a1c08bfbbaefe2b813f4ba08b4c186b04a484
authorKoen Kooi <koen@openembedded.org>
Sun, 6 Nov 2005 10:06:37 +0000 (10:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 6 Nov 2005 10:06:37 +0000 (10:06 +0000)
commit413b4d7adf6863ad55bbb43cd714cf3c60c7c3e2
tree623f424d035805ca974fcbb7c55faeea7a2b1f8f
parent3eeaa7051df89f3241f6420d22aa919001376e39
parent9d45a9e97bdab8a6584ee3f0c96e0423d18c61f8
merge of 0e4a1c08bfbbaefe2b813f4ba08b4c186b04a484
     and 21d66a92293faf76a506c7d17e3cd16e143bb401