openembedded.git
16 years agotask-openmoko-feed: Added midori, microcom and emacs
Rod Whitby [Mon, 1 Sep 2008 08:02:51 +0000 (08:02 +0000)]
task-openmoko-feed: Added midori, microcom and emacs

16 years agolibqpe-opie: enable rtti
Paul Eggleton [Sun, 31 Aug 2008 22:47:03 +0000 (22:47 +0000)]
libqpe-opie: enable rtti

16 years agokonqueror-embedded: improve 20070316 version
Paul Eggleton [Sun, 31 Aug 2008 22:44:11 +0000 (22:44 +0000)]
konqueror-embedded: improve 20070316 version
 * Enable rtti (requires libqpe-opie with enabled rtti)
 * Change from qpe to road GUI

16 years agodia: update to 0.96.1
Koen Kooi [Sun, 31 Aug 2008 20:04:49 +0000 (20:04 +0000)]
dia: update to 0.96.1

16 years agoempathy: put scrollkeeper stuff that conflicts with other packages in its own package
Koen Kooi [Sun, 31 Aug 2008 19:54:55 +0000 (19:54 +0000)]
empathy: put scrollkeeper stuff that conflicts with other packages in its own package

16 years agopython-numpy: fix wrong include paths, but it still tries to run generated code durin...
Koen Kooi [Sun, 31 Aug 2008 16:12:35 +0000 (16:12 +0000)]
python-numpy: fix wrong include paths, but it still tries to run generated code during configure
* it wraps scons with distutils. crazy python dudes

16 years agomerge of '080fcdca01d44047b988dbb0ff626190537f5cae'
OpenEmbedded Project [Sun, 31 Aug 2008 14:52:09 +0000 (14:52 +0000)]
Merge ... '080fcdca01d44047b988dbb0ff626190537f5cae'
     and '22bb42838bf1d7404d344ae172f39130008bc2c7'

16 years agodcopidl: upgrade to 3.5.8 to fix fetch issues
Paul Eggleton [Sun, 31 Aug 2008 14:42:35 +0000 (14:42 +0000)]
dcopidl: upgrade to 3.5.8 to fix fetch issues

16 years agosugar base: add presence service
Koen Kooi [Sun, 31 Aug 2008 14:34:00 +0000 (14:34 +0000)]
sugar base: add presence service

16 years agosugar-presence-service: add 0.82.1
Koen Kooi [Sun, 31 Aug 2008 14:33:37 +0000 (14:33 +0000)]
sugar-presence-service: add 0.82.1

16 years agoempathy: add 2.23.90
Koen Kooi [Sun, 31 Aug 2008 14:28:07 +0000 (14:28 +0000)]
empathy: add 2.23.90

16 years agosuagar base: more rdepends
Koen Kooi [Sun, 31 Aug 2008 14:17:48 +0000 (14:17 +0000)]
suagar base: more rdepends

16 years agointltool native: fix up m4
Koen Kooi [Sun, 31 Aug 2008 14:13:29 +0000 (14:13 +0000)]
intltool native: fix up m4

16 years agotelepathy mission control: update to 4.67
Koen Kooi [Sun, 31 Aug 2008 14:00:19 +0000 (14:00 +0000)]
telepathy mission control: update to 4.67

16 years agolibtelepathy: update to 0.3.3
Koen Kooi [Sun, 31 Aug 2008 13:52:29 +0000 (13:52 +0000)]
libtelepathy: update to 0.3.3

16 years agotelepathy python: update to 0.15.1
Koen Kooi [Sun, 31 Aug 2008 13:45:08 +0000 (13:45 +0000)]
telepathy python: update to 0.15.1

16 years agotelepathy salut: add 0.3.4
Koen Kooi [Sun, 31 Aug 2008 13:42:37 +0000 (13:42 +0000)]
telepathy salut: add 0.3.4

16 years agotelepathy gablle: update to 0.7.8
Koen Kooi [Sun, 31 Aug 2008 13:41:44 +0000 (13:41 +0000)]
telepathy gablle: update to 0.7.8

16 years agotelepathy glib: update to 0.7.14
Koen Kooi [Sun, 31 Aug 2008 13:41:22 +0000 (13:41 +0000)]
telepathy glib: update to 0.7.14

16 years agoloudmouth: update to 1.3.2
Koen Kooi [Sun, 31 Aug 2008 13:13:25 +0000 (13:13 +0000)]
loudmouth: update to 1.3.2

16 years agogtk-doc bbclass: merge from poky
Koen Kooi [Sun, 31 Aug 2008 12:05:32 +0000 (12:05 +0000)]
gtk-doc bbclass: merge from poky

16 years agosane-srcrevs: add clutter stuff
Koen Kooi [Sun, 31 Aug 2008 11:43:24 +0000 (11:43 +0000)]
sane-srcrevs: add clutter stuff

16 years agoclutter: sync with poky
Koen Kooi [Sun, 31 Aug 2008 11:42:53 +0000 (11:42 +0000)]
clutter: sync with poky

16 years agoangstrom 2008: prefer xorg 1.4.2
Koen Kooi [Sun, 31 Aug 2008 11:38:06 +0000 (11:38 +0000)]
angstrom 2008: prefer xorg 1.4.2

16 years agoohm: sync with poky
Koen Kooi [Sun, 31 Aug 2008 11:34:53 +0000 (11:34 +0000)]
ohm: sync with poky

16 years agosugar-base: add librsvg-gtk to RDEPENDS to get svg icons working
Koen Kooi [Sun, 31 Aug 2008 11:17:17 +0000 (11:17 +0000)]
sugar-base: add librsvg-gtk to RDEPENDS to get svg icons working

16 years agocairo: bump PR for pixman change
Koen Kooi [Sun, 31 Aug 2008 10:51:18 +0000 (10:51 +0000)]
cairo: bump PR for pixman change

16 years agoangstrom 2008: prefer pixman 0.11.8
Koen Kooi [Sun, 31 Aug 2008 10:50:04 +0000 (10:50 +0000)]
angstrom 2008: prefer pixman 0.11.8

16 years agoxserver-xorg: bump PR for pixman change
Koen Kooi [Sun, 31 Aug 2008 10:49:05 +0000 (10:49 +0000)]
xserver-xorg: bump PR for pixman change

16 years agopixman 0.11.8: add more arm asm
Koen Kooi [Sun, 31 Aug 2008 10:47:45 +0000 (10:47 +0000)]
pixman 0.11.8: add more arm asm

16 years agozshopi: fix source URL
Paul Eggleton [Sat, 30 Aug 2008 22:28:42 +0000 (22:28 +0000)]
zshopi: fix source URL

16 years agometakit: fix source URL
Paul Eggleton [Sat, 30 Aug 2008 22:27:54 +0000 (22:27 +0000)]
metakit: fix source URL

16 years agoFix path to qcop
Paul Eggleton [Sat, 30 Aug 2008 21:33:31 +0000 (21:33 +0000)]
Fix path to qcop

16 years agoopie-mediaplayer1: Add 1.2.3 versions of mediaplayer1 and plugins
Paul Eggleton [Sat, 30 Aug 2008 21:15:52 +0000 (21:15 +0000)]
opie-mediaplayer1: Add 1.2.3 versions of mediaplayer1 and plugins

16 years agoFix path to qcop
Paul Eggleton [Sat, 30 Aug 2008 20:42:42 +0000 (20:42 +0000)]
Fix path to qcop

16 years agoFix paths to qcop
Paul Eggleton [Sat, 30 Aug 2008 20:37:45 +0000 (20:37 +0000)]
Fix paths to qcop

16 years agoopie-pics: install symlink icon for file selector
Paul Eggleton [Sat, 30 Aug 2008 17:04:22 +0000 (17:04 +0000)]
opie-pics: install symlink icon for file selector

16 years agoopie-clockapplet: install alarm icon image
Paul Eggleton [Sat, 30 Aug 2008 17:01:57 +0000 (17:01 +0000)]
opie-clockapplet: install alarm icon image

16 years agoopie-security: install ownerinfo.png in cvs version
Paul Eggleton [Sat, 30 Aug 2008 15:57:56 +0000 (15:57 +0000)]
opie-security: install ownerinfo.png in cvs version

16 years agolibqpe-opie: fix error in do_patch compilation for cvs version
Paul Eggleton [Sat, 30 Aug 2008 15:54:59 +0000 (15:54 +0000)]
libqpe-opie: fix error in do_patch compilation for cvs version
 * Add citytime-path-2.patch which applies cleanly against current CVS

16 years agoopie-cardapplet: add detection of card insert/remove and fix postinst
Paul Eggleton [Sat, 30 Aug 2008 15:52:24 +0000 (15:52 +0000)]
opie-cardapplet: add detection of card insert/remove and fix postinst
 * Add udev scripts/rules to notify applet of card insertion/removal
 * Fix path to qcop used in postinst

16 years agotask-openmoko-feed: added epdfview
Rod Whitby [Sat, 30 Aug 2008 11:36:04 +0000 (11:36 +0000)]
task-openmoko-feed: added epdfview

16 years agopackages/ffmpeg/ffmpeg_0.4.9-pre1.bb : Add libmp3lame if mp3 support is configured in
Stelios Koroneos [Sat, 30 Aug 2008 10:09:23 +0000 (10:09 +0000)]
packages/ffmpeg/ffmpeg_0.4.9-pre1.bb : Add libmp3lame if mp3 support is configured in

16 years agoffmpeg: Brought in ifaistos' missing patch for fixed linker arguments for libavformat...
Leon Woestenberg [Sat, 30 Aug 2008 09:44:16 +0000 (09:44 +0000)]
ffmpeg: Brought in ifaistos' missing patch for fixed linker arguments for libavformat. Needed for ppc/glibc.

16 years agoffmpeg: Revert DEPENDS on coreutils-native. Instead, remove -s (strip) argument to...
Leon Woestenberg [Sat, 30 Aug 2008 09:28:09 +0000 (09:28 +0000)]
ffmpeg: Revert DEPENDS on coreutils-native. Instead, remove -s (strip) argument to install.

16 years agotask-openmoko-feed: Added pidgin
Rod Whitby [Sat, 30 Aug 2008 07:52:35 +0000 (07:52 +0000)]
task-openmoko-feed: Added pidgin

16 years agobluez: Updated rest of the packages to 3.33 (since 3.28 no longer exists as a recipe).
Rod Whitby [Sat, 30 Aug 2008 06:20:24 +0000 (06:20 +0000)]
bluez: Updated rest of the packages to 3.33 (since 3.28 no longer exists as a recipe).

16 years agopreferred-om-2008-versions.inc: Bumped bluez-hcidump to 1.42
Rod Whitby [Sat, 30 Aug 2008 06:02:17 +0000 (06:02 +0000)]
preferred-om-2008-versions.inc: Bumped bluez-hcidump to 1.42

16 years agomerge of '1ee552cc6f52635092d975d976326b9977dfc32e'
OpenEmbedded Project [Fri, 29 Aug 2008 23:57:44 +0000 (23:57 +0000)]
Merge ... '1ee552cc6f52635092d975d976326b9977dfc32e'
     and '42b443ef8580ee734b2f0f0401489eef57a70a16'

16 years agomerge of '05c8ac666734fffe4be207c184a8d6ec410c203f'
Koen Kooi [Fri, 29 Aug 2008 17:40:21 +0000 (17:40 +0000)]
Merge ... '05c8ac666734fffe4be207c184a8d6ec410c203f'
     and 'cdd9d1c543126b02dd14925c940ec6a31e071be8'

16 years agoangstrom source mirror: update script to hangle bzr and hg
Koen Kooi [Fri, 29 Aug 2008 17:38:59 +0000 (17:38 +0000)]
angstrom source mirror: update script to hangle bzr and hg

16 years agoSlugOS 5.0: task-slugos - temporarily add mdadm and raid1 support to base image
Mike Westerhof [Fri, 29 Aug 2008 17:36:45 +0000 (17:36 +0000)]
SlugOS 5.0: task-slugos - temporarily add mdadm and raid1 support to base image
to facilitate broader testing, add netconsole to base image for next steps, and
cleanup comments in general.

16 years agobitbake.conf: add entries needed for hg fetcher
Koen Kooi [Fri, 29 Aug 2008 17:25:39 +0000 (17:25 +0000)]
bitbake.conf: add entries needed for hg fetcher

16 years agoSlugOS 5.0: enable mdraid support
Mike Westerhof [Fri, 29 Aug 2008 17:00:48 +0000 (17:00 +0000)]
SlugOS 5.0: enable mdraid support

16 years agoSlugOS 5.0: /etc/default/functions - also make sure that /dev/tty0 exists
Mike Westerhof [Fri, 29 Aug 2008 16:58:07 +0000 (16:58 +0000)]
SlugOS 5.0: /etc/default/functions - also make sure that /dev/tty0 exists
as one of the minimal device nodes.

16 years agoSlugOS 5.0 : conffiles - innocuous change to the comments to correct ipkg/opkg.
Mike Westerhof [Fri, 29 Aug 2008 16:56:54 +0000 (16:56 +0000)]
SlugOS 5.0 : conffiles - innocuous change to the comments to correct ipkg/opkg.
This has the desired side-effect of requiring manual review by the user of
sysconf restoration after upgrading to SlugOS 5.0

16 years agoSlugOS 5.0: /etc/init.d/mountall.sh - assemble mdraid arrays before mounting them.
Mike Westerhof [Fri, 29 Aug 2008 16:53:31 +0000 (16:53 +0000)]
SlugOS 5.0: /etc/init.d/mountall.sh - assemble mdraid arrays before mounting them.

16 years agoSlugOS 5.0: udev - mount.sh script needs to use blkid to automatically
Mike Westerhof [Fri, 29 Aug 2008 16:51:18 +0000 (16:51 +0000)]
SlugOS 5.0: udev - mount.sh script needs to use blkid to automatically
blacklist members of a RAID array (lest we automount them, which may
happen, at least with the busybox mount command).

16 years agoc-ares: enable shared library support
Phil Blundell [Fri, 29 Aug 2008 14:16:33 +0000 (14:16 +0000)]
c-ares: enable shared library support

16 years agoc-ares: add 1.5.3
Phil Blundell [Fri, 29 Aug 2008 13:48:48 +0000 (13:48 +0000)]
c-ares: add 1.5.3

16 years agopreferred-om-2008-versions: Bumped bluez to 3.33.
Rod Whitby [Fri, 29 Aug 2008 13:12:24 +0000 (13:12 +0000)]
preferred-om-2008-versions: Bumped bluez to 3.33.

16 years agotask-openmoko-feed: Added tichy, a python applets manager for embedded devices.
Rod Whitby [Fri, 29 Aug 2008 13:00:40 +0000 (13:00 +0000)]
task-openmoko-feed: Added tichy, a python applets manager for embedded devices.

16 years agotask-openmoko-feed: Added zip and firefox.
Rod Whitby [Fri, 29 Aug 2008 12:39:53 +0000 (12:39 +0000)]
task-openmoko-feed: Added zip and firefox.

16 years agopreferred-om-2008-versions: Bumped firefox to 3.0.1, since 1.0.7 doesn't build and...
Rod Whitby [Fri, 29 Aug 2008 12:39:31 +0000 (12:39 +0000)]
preferred-om-2008-versions: Bumped firefox to 3.0.1, since 1.0.7 doesn't build and 3.0.1 does.

16 years agomerge of '6932b153dae1ecb649cc4e5d6557adc86452c225'
Robert Schuster [Fri, 29 Aug 2008 10:21:15 +0000 (10:21 +0000)]
Merge ... '6932b153dae1ecb649cc4e5d6557adc86452c225'
     and '781cbce338e36c4834536a980b1d3c39b24b6860'

16 years agomerge of '3cf7e5f6eed59497a0164a981af89d6bd0f96fae'
Michael Lauer [Fri, 29 Aug 2008 09:03:23 +0000 (09:03 +0000)]
Merge ... '3cf7e5f6eed59497a0164a981af89d6bd0f96fae'
     and 'f51fb525f916aeb12bcca0e4627daa0b3888de81'

16 years agolibsdl x11 remove 1.2.9, 1.2.11 is the new stable one.
Michael Lauer [Fri, 29 Aug 2008 09:01:12 +0000 (09:01 +0000)]
libsdl x11 remove 1.2.9, 1.2.11 is the new stable one.

16 years agoConvert spaces into tabs for better readability.
Khem Raj [Fri, 29 Aug 2008 05:33:34 +0000 (05:33 +0000)]
Convert spaces into tabs for better readability.

16 years agoAll below is done for GCC 4.3.1 and 4.3.2 recipes.
Khem Raj [Fri, 29 Aug 2008 05:18:57 +0000 (05:18 +0000)]
All below is done for GCC 4.3.1 and 4.3.2 recipes.
Enable patches for ARM big endian support.
Delete unneeded ARM big endian patches.
Adjust Thumb support patches.

16 years agoRefresh patches based on 4.3.1 for 4.3.2
Khem Raj [Fri, 29 Aug 2008 02:22:17 +0000 (02:22 +0000)]
Refresh patches based on 4.3.1 for 4.3.2
All it needed was regenerating configure scripts.
-Khem

16 years agomerge of '096edaed3a6739fb64cde01545b29713ce12a1b6'
OpenEmbedded Project [Thu, 28 Aug 2008 16:24:18 +0000 (16:24 +0000)]
Merge ... '096edaed3a6739fb64cde01545b29713ce12a1b6'
     and 'ce38b7c27a6292900bf4749d07d4358565d30c53'

16 years agocollie.conf: fix building of jffs2 images
Thomas Kunze [Thu, 28 Aug 2008 15:58:45 +0000 (15:58 +0000)]
collie.conf: fix building of jffs2 images

16 years agoillume_svn.bb: Add correct AUTHOR and HOMEPAGE to the recipe.
Stefan Schmidt [Thu, 28 Aug 2008 14:35:37 +0000 (14:35 +0000)]
illume_svn.bb: Add correct AUTHOR and HOMEPAGE to the recipe.

16 years agoillume_svn.bb: Drop duplicated recipe from openmoko-projects. Illume is now in E...
Stefan Schmidt [Thu, 28 Aug 2008 14:34:27 +0000 (14:34 +0000)]
illume_svn.bb: Drop duplicated recipe from openmoko-projects. Illume is now in E's svn so we use the recipe in packages/e17/

16 years agoomap3evm.conf : Allow override of kernel. See bug #4527.
Philip Balister [Thu, 28 Aug 2008 11:57:09 +0000 (11:57 +0000)]
omap3evm.conf : Allow override of kernel. See bug #4527.
                Be very careful with this, if you forget the override
                is in local.conf confusion will result :)

16 years agogcc* 4.3.2: add skeleton, it is missing sysroot, xgcc and uclibc patches
Koen Kooi [Thu, 28 Aug 2008 08:11:21 +0000 (08:11 +0000)]
gcc* 4.3.2: add skeleton, it is missing sysroot, xgcc and uclibc patches

16 years agogst-meta-base 0.10 add wav demuxer to meta-audio
Michael Lauer [Wed, 27 Aug 2008 23:14:11 +0000 (23:14 +0000)]
gst-meta-base 0.10 add wav demuxer to meta-audio

16 years agomango-lassi: fix install
Koen Kooi [Wed, 27 Aug 2008 21:55:27 +0000 (21:55 +0000)]
mango-lassi: fix install

16 years agomerge of '93275fa73551aabe0b186dde99fd16be158043ab'
OpenEmbedded Project [Wed, 27 Aug 2008 20:57:09 +0000 (20:57 +0000)]
Merge ... '93275fa73551aabe0b186dde99fd16be158043ab'
     and 'eed8dc866370e81bc5849ef5b2ddfeb8e87d4f1c'

16 years agosane-srcrevs.inc: Sane revs for libgdbus and connman. From OM git.
Stefan Schmidt [Wed, 27 Aug 2008 20:39:58 +0000 (20:39 +0000)]
sane-srcrevs.inc: Sane revs for libgdbus and connman. From OM git.

16 years agoconnman: Connection manager from moblin. Recipe from OM git.
Stefan Schmidt [Wed, 27 Aug 2008 20:38:47 +0000 (20:38 +0000)]
connman: Connection manager from moblin. Recipe from OM git.

16 years agolibgdbus: Add recipe from OM git. Dependency of connman.
Stefan Schmidt [Wed, 27 Aug 2008 20:37:56 +0000 (20:37 +0000)]
libgdbus: Add recipe from OM git. Dependency of connman.

16 years agomerge of '4dc9e841adc6770da91963ff705d5101d2ff3417'
OpenEmbedded Project [Wed, 27 Aug 2008 19:50:43 +0000 (19:50 +0000)]
Merge ... '4dc9e841adc6770da91963ff705d5101d2ff3417'
     and 'fd1d401ab19d2e2f42e5f93edbf8609e4e3012de'

16 years agomerge of '72708eace9dcdb70c5700231b4f92541bb90b6ac'
OpenEmbedded Project [Wed, 27 Aug 2008 19:17:03 +0000 (19:17 +0000)]
Merge ... '72708eace9dcdb70c5700231b4f92541bb90b6ac'
     and '91a0ad611226219a56b014a2e89ec3d70647d2eb'

16 years agosugar-base: it now gets to the first run wizard with these extra depends
Koen Kooi [Wed, 27 Aug 2008 18:56:23 +0000 (18:56 +0000)]
sugar-base: it now gets to the first run wizard with these extra depends

16 years agomerge of '3cb2978c67d7c62746b9e01b6002b3798f3418e1'
OpenEmbedded Project [Wed, 27 Aug 2008 18:43:10 +0000 (18:43 +0000)]
Merge ... '3cb2978c67d7c62746b9e01b6002b3798f3418e1'
     and '81a0838330d2a072edda6c27b5e8c63f40172553'

16 years agohippo canvas: add 0.3.0
Koen Kooi [Wed, 27 Aug 2008 18:29:11 +0000 (18:29 +0000)]
hippo canvas: add 0.3.0

16 years agosugar-base: add more python rdepends
Koen Kooi [Wed, 27 Aug 2008 18:18:41 +0000 (18:18 +0000)]
sugar-base: add more python rdepends

16 years agolinux-2.6.26.bb: package linux 2.6.26 for mpc8313e-rdb
Jeremy Laine [Wed, 27 Aug 2008 18:02:26 +0000 (18:02 +0000)]
linux-2.6.26.bb: package linux 2.6.26 for mpc8313e-rdb

16 years agognome-python-desktop: also build wnck and rsvg modules
Koen Kooi [Wed, 27 Aug 2008 17:50:05 +0000 (17:50 +0000)]
gnome-python-desktop: also build wnck and rsvg modules

16 years agointltool 0.40.3: fix shoddy m4 macro
Koen Kooi [Wed, 27 Aug 2008 17:45:02 +0000 (17:45 +0000)]
intltool 0.40.3: fix shoddy m4 macro

16 years agolibwnck: update to 2.23.6
Koen Kooi [Wed, 27 Aug 2008 17:42:21 +0000 (17:42 +0000)]
libwnck: update to 2.23.6

16 years agointltool-native 0.40.3: replace patch with sed
Koen Kooi [Wed, 27 Aug 2008 17:28:28 +0000 (17:28 +0000)]
intltool-native 0.40.3: replace patch with sed

16 years agointltool: update to 0.40.3
Koen Kooi [Wed, 27 Aug 2008 17:14:55 +0000 (17:14 +0000)]
intltool: update to 0.40.3

16 years agomadwifi-ng: update to snapshot r3837 (required for linux-2.6.26)
Jeremy Laine [Wed, 27 Aug 2008 16:24:36 +0000 (16:24 +0000)]
madwifi-ng: update to snapshot r3837 (required for linux-2.6.26)

16 years agomerge of '0e9b0714e6ab764eaa6afb85fbd5d15b41175604'
Jeremy Laine [Wed, 27 Aug 2008 16:22:56 +0000 (16:22 +0000)]
Merge ... '0e9b0714e6ab764eaa6afb85fbd5d15b41175604'
     and '45a9c4a970e79c5b8343a4a4ff110589bcc19d2f'

16 years agopython-pygame 1.8.1 fix bug ending up missing shared objects
Michael Lauer [Wed, 27 Aug 2008 15:59:22 +0000 (15:59 +0000)]
python-pygame 1.8.1 fix bug ending up missing shared objects

16 years agopython-connexion svn RDEPENDS+=python-ctypes
Michael Lauer [Wed, 27 Aug 2008 15:58:58 +0000 (15:58 +0000)]
python-connexion svn RDEPENDS+=python-ctypes

16 years agoangstrom-x11-base-depends: bump PR
Koen Kooi [Wed, 27 Aug 2008 15:39:05 +0000 (15:39 +0000)]
angstrom-x11-base-depends: bump PR

16 years agomerge of '4dc83fb2fe7f6a2d1912363f0f5d575ef277a6b7'
Robert Schuster [Wed, 27 Aug 2008 15:37:19 +0000 (15:37 +0000)]
Merge ... '4dc83fb2fe7f6a2d1912363f0f5d575ef277a6b7'
     and '6db51d8148c7ab6620fa15c71ccbfc4ec1db4fc0'