merge of '4f38c623129076351ddc15086ffe865d87b655b4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Mar 2008 18:30:22 +0000 (18:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Mar 2008 18:30:22 +0000 (18:30 +0000)
commit150ff5af63affa96bc52751a4593dc2ce824c9b5
tree3473e1081959704e3dba5f2937ae80d0a6d056b7
parent707122f5f0bdde57b8227a1f643d84e8cb0d6127
parent2acdb855669a9af7f819cfc0ec71254bce04cb52
Merge ... '4f38c623129076351ddc15086ffe865d87b655b4'
     and 'f7f15489efbfb6b3c25a219c0a8803930179c346'