merge of '1608fc5062abdfc7660b3e33f0ae5ce2b91f8dc1'
authorKoen Kooi <koen@openembedded.org>
Fri, 25 May 2007 07:26:02 +0000 (07:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 25 May 2007 07:26:02 +0000 (07:26 +0000)
commit9601e1907e1f69bcb43c630082b5d2262926a380
treed8ee37d6fb9613595e86fbe4bd7bcbbbebd921dc
parent7da0823d27eedeb665d59f106f704cdf79ac6cd6
parent453e8f59fd3459121fbf70dabc786d8bd6a4cd88
Merge ... '1608fc5062abdfc7660b3e33f0ae5ce2b91f8dc1'
     and '26e45085fe4ed2dbc8b88365ff8996c52b3ff718'