merge of 38811a337536b285df71efc4a3eb4cdb3f911310
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 25 Jan 2006 21:44:26 +0000 (21:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 25 Jan 2006 21:44:26 +0000 (21:44 +0000)
     and b8a8ab513bcf0fd86ab534ece626c74e6b41b41d


Trivial merge