merge of '91b2ffc800916b90a5871806e605e65d6b2806d2'
authorKoen Kooi <koen@openembedded.org>
Sat, 13 Jan 2007 13:07:55 +0000 (13:07 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 13 Jan 2007 13:07:55 +0000 (13:07 +0000)
commit8b2b49338648be69c6cefb68358e934101cd489f
tree998fa71312ad58ef3e42383a7bf2447448daebc1
parent523046e1f5dfe45d8f88c589254e300ea3c891e8
parent81ee85ebd08f54a51f746e23ef88f8c59d074470
Merge ... '91b2ffc800916b90a5871806e605e65d6b2806d2'
     and 'af92592c9cfb22c3fe7c7dc2280bb03043a3a22f'