merge of '1a392ab8017f1647946ea5d52f90a38c2eb55d50'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Sep 2007 13:45:49 +0000 (13:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Sep 2007 13:45:49 +0000 (13:45 +0000)
commitc0a3f3f52991f9644fb6519f543e2739120e4dd8
tree5e955d193b27f3b6b489db42c9ff8755f5cb9237
parentd5d7f49877fc2ed217488bf2c637d30f244bb337
parentc588b17d68b323577314f91764b1550d141c20fc
Merge ... '1a392ab8017f1647946ea5d52f90a38c2eb55d50'
     and '641f6b995e880a8d62279f125ffae431261ad39b'