merge of 0fea0b8c37d1fc8cb58fb2a3232fd4ad560019a6
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 30 Apr 2006 14:00:49 +0000 (14:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Apr 2006 14:00:49 +0000 (14:00 +0000)
     and fa4b8824108e6379faa2138aa1c6633e4064a703


Trivial merge