merge of '6575450c9bef6aefe7c3b10ab9283aa7cd6e7a99'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Mar 2007 16:48:40 +0000 (16:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Mar 2007 16:48:40 +0000 (16:48 +0000)
commit0d34dd4e5c2135f24cdf7533b96f05c87d93a843
tree8a8045bda3bccfc59500f2af752526ae9b20f2bb
parent26ee96a31a0e213fba9543171b048ba9066065ae
parenta95625e2f04d85730bb832aace358e86265cef20
Merge ... '6575450c9bef6aefe7c3b10ab9283aa7cd6e7a99'
     and '8ea08a21760e2ca7c95e47e532192a9c4566cd3f'