merge of '0c66b53f17f5196eb35fffef39265d813c870e1c'
authorKoen Kooi <koen@openembedded.org>
Thu, 14 Feb 2008 10:32:19 +0000 (10:32 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 14 Feb 2008 10:32:19 +0000 (10:32 +0000)
commita9bd1076ab18ac2c458026c83767e6a9af39ec8f
tree61d532859dbf4a2ed37a2661eb71d70685e313a8
parent31f9e326690a3ead1728ab3f3eb9d5a411a5a6ae
parent6b100ea51727fdae3351fc7da279ea709bff7a48
Merge ... '0c66b53f17f5196eb35fffef39265d813c870e1c'
     and 'e3eea2ab1eb9f03b1640b15f0943c4fec05494cb'