merge of 1ba45cf53c0878304cb1ded93545b1938b45606f
authorKoen Kooi <koen@openembedded.org>
Sun, 12 Mar 2006 13:29:55 +0000 (13:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 12 Mar 2006 13:29:55 +0000 (13:29 +0000)
     and 5478d2000cb4fb6a9810fc0fd5cb8d1fc2903536


Trivial merge