merge of '0d8bbbcdb6668a128380d44dac827d05c8e25266'
authorKoen Kooi <koen@openembedded.org>
Thu, 7 Feb 2008 11:29:05 +0000 (11:29 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 7 Feb 2008 11:29:05 +0000 (11:29 +0000)
commit25a5a3fc7f62ba6488ffb11c3cd9ae07d33b378d
tree127ac83c34af05dc4337337413612d3a216a1753
parentc31c268a231989bbf7749667023ef812a3b3f380
parentb793d8f421a84ea0769c6f6ecf521253ced0636d
Merge ... '0d8bbbcdb6668a128380d44dac827d05c8e25266'
     and '56d99745e997218245cc7d9ec59717796070a9d6'