merge of '296ef22edf7d9a90ec4e4b1c1207b8d2c33940d9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 10 Feb 2008 00:48:53 +0000 (00:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 10 Feb 2008 00:48:53 +0000 (00:48 +0000)
commit9b74675469281deb29b565ec6d2a14e2c8418c56
treece2f3f7843b1d069624189db7a77d77be8619c11
parent512f375b6597875d19760d87bc39dfcfba0ca47c
parent2b39dc8d708431b8316a7d0974a3e5c6a7bedec6
Merge ... '296ef22edf7d9a90ec4e4b1c1207b8d2c33940d9'
     and '8292332b90148c1fb91e9c775883dcf0639290c7'