merge of '6d087d0879bebefbb3ecb1d4c7a2918fcc9dbdcd'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Mar 2008 11:58:55 +0000 (11:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Mar 2008 11:58:55 +0000 (11:58 +0000)
commita43f3026fe3176e1d3cef7c92575511f8b4ec48f
tree631035d205e9a851f5b5fb4b0b25009edf3b0bc7
parent3816baafee5aa5f55f4e961a4f7f29ffeecb7c98
parentcbcc5679a78ce6756051c4756b865636c3bc60b0
Merge ... '6d087d0879bebefbb3ecb1d4c7a2918fcc9dbdcd'
     and 'a348645b7840d8ac81a18e23718751899dd63120'