merge of '150235a307186164d7fe1d23c58f3317a30fd79e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Dec 2007 14:42:31 +0000 (14:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Dec 2007 14:42:31 +0000 (14:42 +0000)
commite2266a64d274a62aafdc41e108523f8330ed76c7
tree3e1aeabfaec47277d5ff29e6f89b8b4b0b438f73
parentcf541c8388d3f543bdf7673ad242338ad3bd2061
parentce4a4d99a7896421c7f2500391f85ff8093df5f5
Merge ... '150235a307186164d7fe1d23c58f3317a30fd79e'
     and '1c0cdd755fb1e51293d868d61a13da01b63ddfe9'