merge of '3b9fd83e9698bae081197909b331c676eba025fd'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Nov 2007 16:18:38 +0000 (16:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Nov 2007 16:18:38 +0000 (16:18 +0000)
commit0ef4b5c5b4ae1de2eaff7120bc332e31110a777c
tree842b89f6ce6fb53165109fb0712d380369955106
parent60010adcb9203f278f8984e7b82d5671a1c08b08
parent8bf214c9b0fdaa68134bb81c39f854ed51a4de56
Merge ... '3b9fd83e9698bae081197909b331c676eba025fd'
     and 'a34feb8c5cd32b70487440b494c3f223e50b122d'