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

Conflicts:

	conf/checksums.ini

diff --cc conf/checksums.ini
index 1791de6,804f8ad..0b1a87a
--- 1/conf/checksums.ini
--- 2/conf/checksums.ini
+++ b/conf/checksums.ini
@@@ -34,10 -46,10 +46,14 @@@ sha256=f09d4ae3365b876da9f40f49178ab724
  md5=333b0e9328194f28af83c26d3717e4ac
  sha256=8930ebfdc8a606d8cb26f073d4700460c3289fb79e943e12948329e17336ca47
  
 +[http://www.ralinktech.com.tw/data/drivers/2008_0506_RT73_Linux_STA_Drv1.1.0.1.tar.bz2]
 +md5=3e08bf734b740e83391fda571c8e9ecd
 +sha256=932b9c127992fd7985e4054d91120164e54f7132fa457b06fdcd30307e5b70f9
 +
+ [http://sense.net/zc/free42/42c_skins.tgz]
+ md5=24b0e5bbfe21ea9c5a5c589bcc79c0f2
+ sha256=ab877846c6caaff32efbf5be6fc5c63b7dec97a2e78c57c525da7705d2052bfc
+ 
  [http://www.amd.com/files/connectivitysolutions/geode/geode_lx/AES_Linux_LX_02.01.0100.tar.gz]
  md5=12cb241a9037fffe31ba7c68a48ed614
  sha256=a6068b4aa0e2330eed6e4741bad3191dc9ca7d7326f7bfab578ac55e2b8b91a2
@@@ -1330,10 -1622,10 +1634,14 @@@ sha256=dedf5325105f071e5d9f898fdb7337a7
  md5=3cb3be404950ef08e51adbe59c7b811e
  sha256=c3648f02dd7d4dc8c0ef9a48089fda4ca47b81a977c838b17f55e6abf7f51447
  
 +[http://sources.dreamboxupdate.com/download/7020/backdrop_dm8000.mvi]
 +md5=404ecdfe1f291ef64079c463fe699ac2
 +sha256=bd486f5434eaa7fd5f39fb67c8dc0394e2d08c2505419c72c5a5a563463658fd
 +
+ [http://heanet.dl.sourceforge.net/avetanabt/avetanaBluetooth-20060413.tgz]
+ md5=3cb3be404950ef08e51adbe59c7b811e
+ sha256=c3648f02dd7d4dc8c0ef9a48089fda4ca47b81a977c838b17f55e6abf7f51447
+ 
  [http://heanet.dl.sourceforge.net/sourceforge/bacula/bacula-1.38.11.tar.gz]
  md5=0d6d6614afdc468d214de4e66f9f5a26
  sha256=d095165d256771c918b80f836feaf837aedc1362b2d67171013d3ab7ac5ee47f
@@@ -1902,22 -2330,10 +2346,26 @@@ sha256=e721987d891ce97ba7a4fc17115a1b48
  md5=4be91177d19069e21beeb106f2f77dff
  sha256=7738399ecfcfb2242e9f99a316b13a5f59e89052de05074dbf705ccf4edc327d
  
 +[http://sources.dreamboxupdate.com/download/7020/bootlogo_dm8000.elf]
 +md5=8ab6ead17f2d51e9b93f968b027cb3a9
 +sha256=d5b517b85c2d346cacaef3fd1833f4aaccf9ba37785fcca94a3bd33563c040c8
 +
 +[http://sources.dreamboxupdate.com/download/7020/bootlogo_dm8000.jpg]
 +md5=017abc2244931c14464ae6d4ad8c2296
 +sha256=5f8ea9e76a10c28282425cb1fccbcfd5897da1e83adeaa9d89744c3597f49f02
 +
 +[http://sources.dreamboxupdate.com/download/7020/bootlogo_dm8000.mvi]
 +md5=c1a99cb9ab8248faaf273cd5d9f16cfd
 +sha256=0c02c791020c5d230fafc226f2282f42434a0b4db66e6aa7eda56f23cec01578
 +
 +[http://sources.dreamboxupdate.com/download/7020/bootlogo_wait_dm8000.mvi]
 +md5=4c3eba94a7092c8ad9adeaa90ed40673
 +sha256=b8057f51a1317294e4feab663ded9652491bcfbaaaf7e141f06129452ad36e6d
 +
+ [http://heanet.dl.sourceforge.net/bootchart/bootchart-0.9.tar.bz2]
+ md5=4be91177d19069e21beeb106f2f77dff
+ sha256=7738399ecfcfb2242e9f99a316b13a5f59e89052de05074dbf705ccf4edc327d
+ 
  [http://www.cosmicpenguin.net/pub/bootmenu/bootmenu-0.6.tar.gz]
  md5=d7d8343f90a149c1604e5a14ea2f967d
  sha256=3ff618bcbf9926f356aec2a604b1f1d617e3f87ad545b1d96c066ed712675845
@@@ -6610,14 -8374,10 +8426,18 @@@ sha256=bbe44edc3d519028761a22b282b912ab
  md5=9e6a16b7d074782d1c62f1f7316e56ab
  sha256=e2db8d3383cd8eca6a18ebee85875de895f3ac7414eab091a87f052d79a87b09
  
 +[http://www.guzu.net/files/hddtemp-0.3-beta15.tar.bz2]
 +md5=8b829339e1ae9df701684ec239021bb8
 +sha256=618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b
 +
 +[http://www.guzu.net/linux/hddtemp.db]
 +md5=7b2651d53d10808e270bc386b6db89dd
 +sha256=ca43f8ab1e4fb3919af940a2fe6a95feb03939f685450a48666763a3edc326bb
 +
+ [http://www.server-side.de/download/havp-0.86.tar.gz]
+ md5=c99c8da224c72844882623086e2b1618
+ sha256=1649ab227c7fd7b4af5ab602a3cdff16c038965c6673c09a239d5df35fa88da8
+ 
  [http://downloads.sourceforge.net/hdparm/hdparm-6.3.tar.gz]
  md5=0c12672f3a09c14ad0b0882f15fc9389
  sha256=08688a6a46ba495494bf838f8f26103e797584c1888eca94e43a171e1b37246d
@@@ -7078,10 -8926,10 +8986,14 @@@ sha256=e8e5144314fd2cd13722835338105c02
  md5=5bcaa0fe3fec26840c8f1ecefc891887
  sha256=53b67c08477623bb03436f79bf2ca859d7cd9684c57775ea539e1db449658236
  
 +[http://sources.dreamboxupdate.com/snapshots/include2.tar.gz]
 +md5=9d236095a88d7ce9f3bf0503ee5237d6
 +sha256=739bc35bccdb1e4c6e14b77ab86808354eb6fd75434d3bd6236f3b3346805e02
 +
+ [http://heanet.dl.sourceforge.net/imposter/imposter-0.3.tar.gz]
+ md5=5bcaa0fe3fec26840c8f1ecefc891887
+ sha256=53b67c08477623bb03436f79bf2ca859d7cd9684c57775ea539e1db449658236
+ 
  [ftp://ftp.gnu.org/gnu/inetutils/inetutils-1.4.2.tar.gz]
  md5=df0909a586ddac2b7a0d62795eea4206
  sha256=9f001daa0f3d571ae35aac88f04d5dd982a14e90257e4dfb535c143fa18d5830
@@@ -11310,10 -14042,10 +14146,14 @@@ sha256=db0c299592b8f1f704f41bd3fc3a2bf1
  md5=d605b6068b6c9aa2bc7550f49c60958c
  sha256=7e5e1768db0201981f90256fa94db3f09f23285ffd60dc60a51a753825084848
  
 +[ftp://archive.debian.org/debian-archive/pool/non-free/m/mrouted/mrouted_3.9-beta3.orig.tar.gz]
 +md5=96067b571622ac232dab42a5c56dcedc
 +sha256=8d38a1feadf9298dd554b352fd6cc247207c930ef0c7df736deb5b44e5c58fb6
 +
+ [http://heanet.dl.sourceforge.net/libw100/mplayer-imageon.patch]
+ md5=d605b6068b6c9aa2bc7550f49c60958c
+ sha256=7e5e1768db0201981f90256fa94db3f09f23285ffd60dc60a51a753825084848
+ 
  [http://downloads.sourceforge.net/materm/mrxvt-0.5.2.tar.gz]
  md5=ed87b7dd9f4fb482de0f14f085085027
  sha256=558491d1f112362780abaf7429d14216e658b7768dd30f82f102ce646d3065cf
@@@ -11914,10 -14890,10 +15002,14 @@@ sha256=347c551e7c88affc1f4b7a4b71508025
  md5=7401faebc6baee9add32608709c54eec
  sha256=063f00d5b889beee910eb113c8cfbb4fc85cd404693494bcaaf79dd09a98335c
  
 +[http://sources.dreamboxupdate.com/download/snapshots/openwrt_madwifi_patches_20080829.tar.bz2]
 +md5=f5cef7c338bd09d2e6774033e8509c34
 +sha256=e48847244e137cdba469f1937fc3dc0c4a399a1b8dc8a1563dac654135d650c8
 +
+ [http://heanet.dl.sourceforge.net/gakusei/openwrt-imagetools-svn-rev7641.tar.bz2]
+ md5=7f35543286911b827dcbf8d07a7d72be
+ sha256=bad49b59646dbea380cc88be13a77d17c70488b8e11e85f7dd474930fa9cf36a
+ 
  [http://downloads.sourceforge.net/oprofile/oprofile-0.9.2.tar.gz]
  md5=9af4e1e1aab89131516736bb60e9efba
  sha256=4b3780ee09efe665a69151c994e0e5f01a56c57338660c18df30916904df83a6
@@@ -15946,10 -20034,14 +20154,18 @@@ sha256=acd218148d7f92ee7bd0539d6aabd0b4
  md5=67a48fd9b69db8818a4dca5375c7993a
  sha256=cb4909d8753dff7f6ac90a62a61ed1ae68e49ead2dbc60c22673c55bb0e14a36
  
 +[http://sources.dreamboxupdate.com/download/7020/wdog-dm8000]
 +md5=dc7c1a43733033e0bebfe57cf06a4562
 +sha256=82d626e85a0b63d715b79a79e6ebacc25dd3b739320dbcdafd79cbb7ed0cc351
 +
+ [http://heanet.dl.sourceforge.net/meta-tools/weather-0.7.0.tar.gz]
+ md5=ce547183f7b455d837d654a484b29a83
+ sha256=fabdec4b04d50b50558b6062d35884c60b419e65b3738b08be07d729b6f3d46a
+ 
+ [http://webpy.org/static/web.py-0.21.tar.gz]
+ md5=9877a65a31bd97f649562ceab123995d
+ sha256=1900e88c268fe48b8f79589683068e1160792bcac2bd3867a262a02081755ccb
+ 
  [http://downloads.sourceforge.net/webcamserver/webcam_server-0.50.tar.gz]
  md5=96830836f64edbb12c248eb84e6b0d18
  sha256=b8e200ae66c20897c9aaa80b0044e638a0016d3bdb6e67560fd61f1ef162f305

diff --cc packages/dsplink/dsplink.inc
Simple merge

diff --cc packages/sysvinit/sysvinit_2.86.bb
Simple merge