merge of '7fa457f0b3692dd1829c417e2b50813397a844a7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 09:37:08 +0000 (09:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 09:37:08 +0000 (09:37 +0000)
commitf0df9d59537253071f36813c5770f473fc810c16
tree5705ceb9110f00da8c3c011943dfc500b25ed8bb
parent29ecffc666e166906ccaa73f65c2e12ea17a1769
parent2bf7fa7efeea1f611f33d507b2f794b2910d3189
Merge ... '7fa457f0b3692dd1829c417e2b50813397a844a7'
     and '9aad32caf3729c944410f4ee750d845e7bde3232'