merge of '38bc1cc48b4168ea2aafb31b0de856f57a0625b2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 May 2007 17:37:55 +0000 (17:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 May 2007 17:37:55 +0000 (17:37 +0000)
commit05a8150421df8f7bd450b5d8c943403cab3658da
tree66b57b42b88f28ba56f925dcdaf1d5f57500bfc1
parent8022e97c116af8ac1433db41dbe70f7fdf56cee1
parent364361f05b1ee434c4d6807506fdd460fcfe6eee
Merge ... '38bc1cc48b4168ea2aafb31b0de856f57a0625b2'
     and 'bc8cfed5e37f251070c62f9cef49b1db7aa86264'