merge of '452a82218384d46f3ac39581fe8409623ec425a1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 8 Feb 2008 01:24:27 +0000 (01:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 8 Feb 2008 01:24:27 +0000 (01:24 +0000)
commit57e9747071543c5f8d8e62a508b3400937ea8532
tree2bbc1bfead560718fe0b85792c2328effeca412f
parent7fbf6ee54374e1791bdbbd97b16d19b14599546e
parentba4001fe8c00586b71fb1043795e1b99e3234025
Merge ... '452a82218384d46f3ac39581fe8409623ec425a1'
     and '63e1c5b96606f5261e825fbcd0022b3c5961a1a9'