merge of 657428f7610ffe279e57ccd9a34630fcb0db722f
authorKoen Kooi <koen@openembedded.org>
Sat, 23 Jul 2005 23:05:41 +0000 (23:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Jul 2005 23:05:41 +0000 (23:05 +0000)
commit9d7869061375488858389c37229acc709bc13b1b
tree860bc95c172ab168cc300e78e0d00145c02cbfa1
parent46d0f40c18ca6690faa48e6c5a164da917694a8c
parent191ce0e711d1caa29cb3bf6d10d30299af726554
merge of 657428f7610ffe279e57ccd9a34630fcb0db722f
     and 7a1a1d1dc2d072ab7829bb7c3314d4604d4445d6
conf/tinder.conf