merge of '518cab8ae2535562912ff7f5fdba8458448a0e18'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 18 May 2008 20:08:50 +0000 (20:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 18 May 2008 20:08:50 +0000 (20:08 +0000)
commit18f8e80f6bdaa4ff5624e483376560bd31eb5be8
tree55c31d1b583c3bdbe188cfda2e00a888d03a28fc
parentdb96081b9d6c015ec77dbdcfe122fb785abfb68c
parentdeaea737cb8197cbd8c333f3158692774683dc9c
Merge ... '518cab8ae2535562912ff7f5fdba8458448a0e18'
     and 'c0506e8e648ca1fe78fd69e6ce1b63a3bd38d877'