merge of 82395a95d15315d08913d7db8bca623b608fd94c
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 19 Nov 2005 18:52:47 +0000 (18:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 19 Nov 2005 18:52:47 +0000 (18:52 +0000)
     and fef709d50daa91409822776c39d991f7af0eab9b


Trivial merge