merge of '65c91eebd05689a29a616ec89161e6f2fd9c175c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Dec 2007 18:43:34 +0000 (18:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Dec 2007 18:43:34 +0000 (18:43 +0000)
     and 'd15e00e8400bf7fe6620cae0a3299d08632f1ff3'


Trivial merge