merge of '64a99c44cf4b94f829d2fb02ed7fb05a16da4669'
authorKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 11:11:42 +0000 (11:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 11:11:42 +0000 (11:11 +0000)
commitefe359556d6854fe2953ecf586b00eedcdaf28cb
tree701bfbe2953fa5cca215b55ae7ba76e96f1919cb
parent0326734fc3cfd0ee21e331936fa3b66e6de2fda8
parentaa151d1d31446f8fec66f41d88aabf0dac39627c
Merge ... '64a99c44cf4b94f829d2fb02ed7fb05a16da4669'
     and 'bb6c1f5981b1f6f71320c3c1635ef323edc2a9e1'