merge of 21d01652e3aa40ef6aef3a3bc47a1d618d24501d
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 12 Mar 2006 15:38:16 +0000 (15:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 12 Mar 2006 15:38:16 +0000 (15:38 +0000)
commite58723dfb051aee843224b87027a08bd0901960f
treecfca4bc2d517f6ec9213b786f3cf658b8a7b5da7
parent695254b45c61e92157f0a06e7c906b1792d7a816
parent6f259b67b3d01939c69e51d8df1713f86de8d809
merge of 21d01652e3aa40ef6aef3a3bc47a1d618d24501d
     and 344ea81de10e1b863ad4c83421c41c9cb8680f36