merge of '50c7f89abe3b8e0587d863672399614b1f2cb6d5'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Sep 2008 10:25:40 +0000 (10:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Sep 2008 10:25:40 +0000 (10:25 +0000)
commit0e60436ef61d52ed11bba5926c4c7dbd191749ac
treea60daf44ac4772911c46940fa8283b54447a7b33
parent614d641dda3ea8a65293697ce2847f47984257b8
parentae63a4dad7b06af132c6ba5bdb5fb98b2231525a
Merge ... '50c7f89abe3b8e0587d863672399614b1f2cb6d5'
     and '9daaac3730faf9e4dc3c89cd380025bec6460aed'