merge of '239b4232a0af35c5c04016055fb9696c66213993'
authorKoen Kooi <koen@openembedded.org>
Fri, 23 Mar 2007 12:46:20 +0000 (12:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 23 Mar 2007 12:46:20 +0000 (12:46 +0000)
commit93d6e2205999a602d803d005de6dfa6f26619729
tree59dc65400bc23a907d578ccebbed93e06e9ada63
parentd71608dcdee07a3e87b640fdc5b1346f733d5379
parenta2726a79c3c6d090e92c26c5f101adce20b470b4
Merge ... '239b4232a0af35c5c04016055fb9696c66213993'
     and '7c52437404c05555219a1ddce7bb0a7d5cefa5d0'