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)
     and 'f7f15489efbfb6b3c25a219c0a8803930179c346'


Trivial merge