merge of '3985bcd7ec541c61234ed284c4d7d7ee263a3a9f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 12 Oct 2008 01:22:36 +0000 (01:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 12 Oct 2008 01:22:36 +0000 (01:22 +0000)
commit3bc3e2b4ff8e6e17351b2938fb18ae11eb069eed
treecc1f3d99429f694e68f5b07b508fcda101a02a01
parent984884dc32fdf23a7b82e04d86a8515b1c73beb7
parente4f40e3c951e3ed7f0624a8ba1d440aba6af27e7
Merge ... '3985bcd7ec541c61234ed284c4d7d7ee263a3a9f'
     and 'eb9fcfc3252827f84d56edd36426fb39c72f1eed'