Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into...

diff --combined conf/checksums.ini
index 7fb1d41,f2c0288..0853484
--- 1/conf/checksums.ini
--- 2/conf/checksums.ini
+++ b/conf/checksums.ini
@@@ -18902,10 -18902,6 +18902,10 @@@ sha256=b6bbb0dea427aa733c37d58a94b819b5
  md5=b0aac48e4528aa1fa2b6759f53508643
  sha256=6ae71591d0184debcafb134896577447574c8b29545af6e99f6ff09dc3448571
  
 +[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.25/patch-2.6.25-rc4.bz2]
 +md5=a4cc0fd5bda60e498246b6d69c873895
 +sha256=781656a17fe24b018ab2c33c2481c2a07e9abfa9c6203995e2fbf7c852adda3a
 +
  [http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.25.20.bz2]
  md5=9d870b9947ce0618cf18445e4be33e15
  sha256=c4d69706880f274b84c8f5ef36ce955b3173e6ea3c083f724c0371096b27e738
@@@ -20774,6 -20770,10 +20774,10 @@@ sha256=4f6319c6031af47ef81fef08f465e4db
  md5=43e7384c59625af0830032348f672a1d
  sha256=f525ad885675f4c2413d67d9a5efaf7c34862d88c796fe7e7e2d05a42a1a66c8
  
+ [ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-4.5.2.tar.bz2]
+ md5=62186345c609a72b89f16d83bc7a130f
+ sha256=272301a27e2f7bcd44c8d09f496e1c749c80b86d9489ea9c30bb265bf2dd02fc
+ 
  [ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.5.tar.bz2]
  md5=05d04688c0c0230ed54e89102d689ca4
  sha256=aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96
@@@ -20830,6 -20830,10 +20834,10 @@@ sha256=61831af6b71c7bd4e1ef542071225835
  md5=f81a94e2ab7713b2d375d4e5cfc8e051
  sha256=aa3f5a459d042681a321f33e8d99468337a00674d68b8a512e0078625c1f51da
  
+ [ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.5.2.tar.gz]
+ md5=d8bcc070a58db25c228b7729ffad4550
+ sha256=4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2
+ 
  [ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.2.0.tar.gz]
  md5=9519eccf0638c9962f73a7b20da77e0e
  sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883