merge of b6447bbbb5bade625f6d420c64aea5058cdd13f3
authorPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 7 Feb 2006 22:34:17 +0000 (22:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 7 Feb 2006 22:34:17 +0000 (22:34 +0000)
     and bc23517ec32ecd81c447b68448a9d895dc712e4c


Trivial merge