merge of '9de858c0d5fedfdd613ec3bafebb89c999100869'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Dec 2007 16:33:38 +0000 (16:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Dec 2007 16:33:38 +0000 (16:33 +0000)
     and 'b8146248b63ab8beefda37316fe2917efa8817a5'


Trivial merge