merge of 'a796b081d8845fac70a8842df854fc7d82eb0b27'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Apr 2008 12:58:57 +0000 (12:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Apr 2008 12:58:57 +0000 (12:58 +0000)
commit00e7c9b53922ae2c745406774c155160e6954307
treecf8521279096ea920fa95b059c503691b0227aa1
parentce9487cb7dfc40a43b957d025bc0936e81bdc17e
parentd1f91195bd908dc4f20ee348963cb3c5f1b8cc2c
Merge ... 'a796b081d8845fac70a8842df854fc7d82eb0b27'
     and 'eb6012f4f544cad5eba77acb92e2eafbff01a119'