merge of '3a05a99898476f8785cfc6c4ffdab52a170cc3e0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 28 Aug 2007 12:06:48 +0000 (12:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 28 Aug 2007 12:06:48 +0000 (12:06 +0000)
commit3477a6c31b6db7ea305e2911dfe3f9c7eeadc86c
tree6df9b7bd8ca7c6433d77e2a04faf81fe1ea0dae0
parent9dc18f05c344dc37214540d90550f72787265acc
parent470ee21d142e13256311cbf9b62f2048ccf14307
Merge ... '3a05a99898476f8785cfc6c4ffdab52a170cc3e0'
     and '7d0e0dda1833d41fc45440f5824943ab387d0698'