merge of '877d7e013761ee744293481a1d3675bab891e209'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Apr 2008 16:20:41 +0000 (16:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Apr 2008 16:20:41 +0000 (16:20 +0000)
commit08a90416dfacd1283401ef640a5656f60af4b207
tree2794f5d88e5cdfbad71ae651eb1dbb6c4c20c636
parent16aa0511beed363b7ecf24f207fd2dcba92c2108
parent607f6a3c12a7fd78ede22ce8227da95dbfcf3410
Merge ... '877d7e013761ee744293481a1d3675bab891e209'
     and '8e2294c420be84826fda7e7cdab3d6ae13381c82'