merge of 'af851f4509aae0ba4c539361ee5e09b515f331f8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Jul 2008 12:52:11 +0000 (12:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Jul 2008 12:52:11 +0000 (12:52 +0000)
commit05db31fa1307cec7691be6f83d927fe8f3d74317
tree5306377356f1f6be895f91bf42c78b7b00b5df90
parent8dfedb7131d2aea7829ae4c0640ce388dfa8d582
parent0658c11da759d064ff8a43e70bfcd4c002045074
Merge ... 'af851f4509aae0ba4c539361ee5e09b515f331f8'
     and 'b43a21b343fe9c1dc9cb8c83379234f15bc53f72'