merge of '150235a307186164d7fe1d23c58f3317a30fd79e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Dec 2007 14:42:31 +0000 (14:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Dec 2007 14:42:31 +0000 (14:42 +0000)
     and '1c0cdd755fb1e51293d868d61a13da01b63ddfe9'


Trivial merge