merge of 'b0f2b6b66673367e2119e54761590a724c20c2e1'
authorKoen Kooi <koen@openembedded.org>
Sun, 17 Jun 2007 10:25:34 +0000 (10:25 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 17 Jun 2007 10:25:34 +0000 (10:25 +0000)
commitaff97e9475c2a48122851f24b5500fd11c4600c4
tree8f08e0d2536697e0a9d65cd3aabe3887e2269ea2
parentcfd086c000f94b852dc953d2ed2637e155a2e899
parentce8819cf9c39e47d0ae5718e6ed960f773f75c31
Merge ... 'b0f2b6b66673367e2119e54761590a724c20c2e1'
     and 'd4199b222eb8c2755fae3eefe9fdbd225e6d9e81'