merge of '3d8fcb3e38b76cf853ceee12d6cd8f1d518b546b'
authorKoen Kooi <koen@openembedded.org>
Mon, 4 Aug 2008 13:14:37 +0000 (13:14 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 4 Aug 2008 13:14:37 +0000 (13:14 +0000)
commit5194151b2cfa37b8444614603dda36b067b2a86c
treeae41572b3ed38a5f26e8664cfc903e7e0494476d
parent89db1179c644dde2377addf6d0c44ec330e151f6
parenta43a2dac05751b784d8bcc50a1fc91527bf511cc
Merge ... '3d8fcb3e38b76cf853ceee12d6cd8f1d518b546b'
     and '7d3ee6f9dd094cfa51709c24c15492d19ad64af7'