merge of '129af2bd91ba53785161642a1d0002b55797f5f4'
authorKoen Kooi <koen@openembedded.org>
Tue, 26 Jun 2007 09:44:01 +0000 (09:44 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 26 Jun 2007 09:44:01 +0000 (09:44 +0000)
commit56d2d617dee05c546ccd9f3aa0eed243f130ffaa
tree135e50985973145eca8c23d6e42b7e64db8403d3
parent6882e085a89278ac363da4ffc6fecb7cbc064ecd
parent7147e81f2ab5b63ef008189773b926138f99d860
Merge ... '129af2bd91ba53785161642a1d0002b55797f5f4'
     and '477ae0076f30be01a0a3ccbeffc47b13efb2b7c4'