From: Koen Kooi <koen@openembedded.org>
Date: Sat, 23 Jul 2005 23:05:41 +0000 (+0000)
Subject: merge of 657428f7610ffe279e57ccd9a34630fcb0db722f
X-Git-Tag: Release-2010-05/1~9453^2~4078
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d7869061375488858389c37229acc709bc13b1b;p=openembedded.git

merge of 657428f7610ffe279e57ccd9a34630fcb0db722f
     and 7a1a1d1dc2d072ab7829bb7c3314d4604d4445d6
---

9d7869061375488858389c37229acc709bc13b1b
diff --cc conf/tinder.conf
index 00cb7fa5db,f2bf88ceec..bb28bb320e
--- a/conf/tinder.conf
+++ b/conf/tinder.conf
@@@ -18,5 -19,3 +19,4 @@@ INHERIT          += "tinderclient
  #TINDER_FROM       = "you@yourhost"
  #TINDER_REPORT     = "1"
  
 +TINDER_START     := "${@time.strftime('%m/%d/%Y %H:%M:%S', time.localtime())}"
-