merge of '15ad25c2df41e72ad281610da11230b4d0c9bd20'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 6 Jan 2008 01:29:28 +0000 (01:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 6 Jan 2008 01:29:28 +0000 (01:29 +0000)
     and '5bfb1624d0726e9c07b5b20f7ecccb236fee357c'


Trivial merge