From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Wed, 10 Feb 2010 13:33:57 +0000 (+0100)
Subject: Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev
X-Git-Tag: Release-2010-05/1~520^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b75cb91f845d1871e159398c1315ece2119fee2d;p=openembedded.git

Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev

Conflicts:

	conf/checksums.ini
---

b75cb91f845d1871e159398c1315ece2119fee2d
diff --cc conf/checksums.ini
index 661b4aeefc,07a9b92c74..a432a2b61c
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@@ -27682,10 -27694,10 +27694,14 @@@ sha256=9d1cb3661e6c15059e4eecce323b3f11
  md5=f34e85c15a7ecec880c03d70e6e3ad20
  sha256=d4a055b0eb714d5335e21db8d685f27a59f2f7b639bf8229429e6e9325928674
  
 +[http://www.freesmartphone.org/sources/vala-0.7.10.2.tar.bz2]
 +md5=f1d2d0c254b97ac298283d795dc88625
 +sha256=2bd7bfc71e56f2d29a0c971a81e7ff098a96d0e79d68eed0d604f3882ccd6fe6
 +
+ [http://www.freesmartphone.org/sources/vala-0.7.10.tar.bz2]
+ md5=6e807644f500d6605a5ee4e1612dd187
+ sha256=902392d95e20e8c3e18ad739e24c6727dd90fe281b1ffdbbf509a8d7c50aa8c5
+ 
  [http://www.freesmartphone.org/sources/vala-0.7.5-fso2.tar.gz]
  md5=1a10e3c3d7c8eab324ecb0d8b81732bd
  sha256=4dfd1ff2793f71ab11d842ff4379a676a30af4287b7b6892ba9733bf7b691c10