Commit Graph

113 Commits

Author SHA1 Message Date
Robert P. J. Day
1a4a077fac xinit_1.3.2: Remove broken, superfluous 'FILES_${PN} += "${libdir}X11/xinit"'
Besides being clearly broken, that line is unnecessary as that file is
already being picked up from this line in xorg-app-common.inc:

FILES_${PN} += " ${libdir}/X11/${BPN} ${datadir}/X11/app-defaults/"

(From OE-Core rev: 45b8dcc65b46c68151093a2931cce675abb92813)

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-26 14:40:48 +01:00
Laurentiu Palcu
da043d0dc1 xinput: upgrade to 1.6.0
Licence file changed, an entire part has been removed.

See diff below:

<<
 TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.

-
-Copyright 2007 Peter Hutterer
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the author shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the author.
-
-
+Copyright © 2007 Peter Hutterer
Copyright © 2009 Red Hat, Inc.

Permission is hereby granted, free of charge, to any person	obtaining a
>>

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-09 16:58:55 +01:00
Valentin Popa
7874440990 xev: updated to 1.2.0
tested on sato

(From OE-Core rev: e7b3040f0a0f5356949e6a51d9d9d1c8dcf1f3c9)

Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-25 16:35:52 +01:00
Richard Purdie
4a158688e6 xeyes/pong-clock: Update recipes
(From OE-Core rev: a1bdb86c6fcb925cef10e613dd553c766e359188)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-08 14:49:16 +01:00
Richard Purdie
67f6baa72a meta-demoapps: Remove except for xeyes and pong-clock
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-May/022059.html

As proposed by Martin Jansa with a couple of changes from me.

(From OE-Core rev: 204ee7391c19f9b2fa7f8b2ef46d04c7ccf5bd42)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-08 14:49:16 +01:00
Saul Wold
68eadb4847 xauth: Update to 1.0.7
(From OE-Core rev: 7f020c1e8429ab510f4c41ac7b7abfdd4db308fb)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-03 15:48:07 +01:00
Saul Wold
02a0202511 xkbcomp: Update to 1.2.4
(From OE-Core rev: 7bab740e59bc25c9887d1e38e8106073b0c8c5af)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-03 15:48:07 +01:00
Saul Wold
db62a4f4ed xhost: Update to 1.0.5
(From OE-Core rev: eb087d8dacab9e4a7ea1fce35cd86b0c71f0a630)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-03 15:48:06 +01:00
Saul Wold
667ef5b25a xmodmap: Update to 1.0.7
(From OE-Core rev: 6615decca17874dcd212d7a17bb3078808a705fb)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-03 15:48:05 +01:00
Lianhao Lu
53cf1a8977 xorg-app: Use ${libdir} and ${datadir} for packaging.
Used ${libdir} and ${datadir} instead of hard coded direcotries for
packaging.

Also included INC_PR in PR.

(From OE-Core rev: ff533176a875663be797058bc35fa8ff3f9f8147)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-30 11:37:29 +01:00
Denis 'GNUtoo' Carikli
8809f2be92 xev: move from meta-demoapps
* The location where xev was located didn't contain xorg-app-common.inc,
  but still xev requires it. So moving it fixes that issue.
* File checksums and License checksums were also added.

(From OE-Core rev: 764bc41950513bede2ff763d0db55961f00318da)

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-26 10:59:54 +01:00
Randy MacLeod
7e48717295 xinit: Update to 1.3.2 -- Typo fix.
On 12-02-02 06:47 PM, Saul Wold wrote:
> (From OE-Core rev: 04ab1fb8cc38da6c8a8b1474cf0060402f814a76)

Signed-off-by: Saul Wold<sgw@linux.intel.com>
> ---
>   .../xorg-app/{xinit_1.3.1.bb =>  xinit_1.3.2.bb}    |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)
>   rename meta/recipes-graphics/xorg-app/{xinit_1.3.1.bb =>  xinit_1.3.2.bb} (79%)
>
> diff --git a/meta/recipes-graphics/xorg-app/xinit_1.3.1.bb b/meta/recipes-graphics/xorg-app/xinit_1.3.2.bb
> similarity index 79%
> rename from meta/recipes-graphics/xorg-app/xinit_1.3.1.bb
> rename to meta/recipes-graphics/xorg-app/xinit_1.3.2.bb
> index 2ddebe6..e029a03 100644
> --- a/meta/recipes-graphics/xorg-app/xinit_1.3.1.bb
> +++ b/meta/recipes-graphics/xorg-app/xinit_1.3.2.bb
> @@ -10,11 +10,11 @@ then terminate."
>
>   LIC_FILES_CHKSUM = "file://COPYING;md5=0d4b5eef75f1584ccbdc5e4a34314407"
>
> -PR = "r2"
> +PR = "r0"
>   PE = "1"
>
> -SRC_URI[md5sum] = "ee234056d8a3dbf37b61b4bcb35b88e4"
> -SRC_URI[sha256sum] = "c7468dfae94bdb42785d79623c27156dc4bf379d8372992830482cb04d8439b0"
> +RC_URI[md5sum] = "9c0943cbd83e489ad1b05221b97efd44"
> +SRC_URI[sha256sum] = "a1867fdaa83f68750b12ba4305c3c62f5992d0f52cfeb98e96c27a8e690e0235"
>
>   EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie"
>
Fix this warning:
WARNING: Missing md5 SRC_URI checksum for
   /.../downloads/xinit-1.3.2.tar.bz2, consider adding to the recipe:
SRC_URI[md5sum] = "9c0943cbd83e489ad1b05221b97efd44"

$ git diff meta/recipes-graphics/xorg-app/xinit_1.3.2.bb
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-13 23:18:46 +00:00
Saul Wold
4ab5d64b96 mkfontscale: Update to version 1.1.0
(From OE-Core rev: 5293df3a10a27dcd1d68b2a5c716f236fcbbaff8)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-28 12:27:47 +00:00
Saul Wold
4770a6e6ad mkfontdir: Update to version 1.0.7
(From OE-Core rev: 87fad1bbdad0b1da6aa6f1e5e933655fbf3247cd)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-28 12:27:47 +00:00
Khem Raj
44f0a2cfc5 xorg-apps: Bump PR to accomodate meta-oe recipe deletion
rgb in meta-oe has been removed in favour of
oe-core which requires a PR bump so feeds
keep working

(From OE-Core rev: 00c2e80e8cae2db6e2c34b1291c615f7f146b070)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-08 00:50:25 +00:00
Saul Wold
e7973af409 xinit: Update to 1.3.2
(From OE-Core rev: 1b3db3597c2b644e61394014886082eb212eef1a)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-03 15:56:35 +00:00
Andrea Adami
4f108e93b7 xinput: add utility for configuring and testing XInput devices.
* from meta-openembedded with minor editings
* (fields reordering like other recipes in xorg-app)

(From OE-Core rev: 618da7f65d3f9e3a1a5ee0b35371ae036a219a9a)

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-19 11:34:12 +00:00
Elizabeth Flanagan
5eeea9e170 OECore license fixes: meta/*
This is a quick audit of only the most obviously wrong licenses
found within OECore. These fixes fall into four areas:

- LICENSE field had incorrect format so that the parser choked
- LICENSE field has a license with no version
- LICENSE field was actually incorrect
- LICENSE field has an imaginary license that didn't exist

This fixes most of the LICENSE warnings thrown, along with my prior
commit adding additional licenses to common-licenses and additional
SPDXLICENSEMAP entries.

HOWEVER..... there is much to be done on the license front.
For a list of recipes with licenses that need obvious fixing see:

https://wiki.yoctoproject.org/wiki/License_Audit

That said, I would suggest another license audit as I've found
enough inconsistencies. A good suggestion is when in doubt, look at
how openSuse or Gentoo or Debian license the package.

(From OE-Core rev: 3083dd70b3a9fa01fcc3cf00373b05502505996e)

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-08 15:24:32 +00:00
Zhai Edwin
961ee2fc8d x11perf: Upgrade to 1.5.4
(From OE-Core rev: 4a80d46baee6d845c7d6afea1ef9a4240bcbe15a)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 22:18:10 +00:00
Saul Wold
bc4cfbe37d xwininfo: Update to 1.1.2
(From OE-Core rev: e86094eb904995d258bf25f1e54670ef7bdd497f)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 15:15:04 +00:00
Saul Wold
4e353033af xset: Update to 1.2.2
(From OE-Core rev: 51ea458d2be3a0ea51cb5a5d9b2ee1d8f81e6eb4)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 15:15:04 +00:00
Saul Wold
00ae5d640e xrandr: Update to 1.3.5
(From OE-Core rev: f7b5c538c964fbfab491fdd977d1397f8a4e567e)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 15:15:03 +00:00
Saul Wold
3d656f04ad xprop: Update to 1.2.1
(From OE-Core rev: 0649eb65a857444bffe8c74302dfe50e39911e37)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 15:15:03 +00:00
Saul Wold
51a68d5304 xkbcomp: Update to 1.2.3
(From OE-Core rev: 7a7119edcd85837571af6fca07fc52a3fd8a83ea)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 15:15:03 +00:00
Saul Wold
fbb2d249f7 xinit: Update to 1.3.1
(From OE-Core rev: 234071f22c2183ea28cda55bac8f68cb47e8f0e1)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 15:15:03 +00:00
Saul Wold
7fe0d3583f xdpyinfo: Update to 1.3.0
* Rebase patch to update code

(From OE-Core rev: 30582835b44a474416dcc8b887bfc2bc32e0e3f8)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 15:15:02 +00:00
Saul Wold
e9b8a4ce79 mkfontscale: Update to 1.0.9
(From OE-Core rev: e3a8ef74b4ebb8ec131d18960552b52865626d1e)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-30 15:15:02 +00:00
Otavio Salvador
acbf65b9a6 xinit: rdepends on util-linux-mcookie to avoid brining whole util-linux
(From OE-Core rev: a8ed4fcd79f6283c1d45f347dce894d784183900)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-11 11:01:08 +00:00
Paul Menzel
4a8678a503 xinit: Fix startx looking for mcookie in sysroot
`startx` run on a system based on the demo systemd image [1] and `opkg`-installed packages fails with the following error.

	/usr/bin/startx: line 139: /OE/tentacle/build/tmp-angstrom_2010_x/sysroots/x68_64-linux/usr/bin/mcookie: No such file or directory

Applying commit 443bcc07 [1] from OE-classic

        Author: Tom Rini <tom_rini@mentor.com>
        Date:   Thu Apr 7 10:36:43 2011 -0700

            xinit: Fix mcookie / util-linux-ng dependency

            xinit just needs to know the runtime path of mcookie so we need to
            RDEPEND on util-linux-ng and pass the runtime path in via EXTRA_OECONF

            (From OE-Core rev: 1053a6a8e15851ef139d8aa4683849fc2fc277e1)

Signed-off-by: Tom Rini <tom_rini@mentor.com>

fixes this issue. Commit 7f6cec6f [2]

        Author: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
        Date:   Sun Feb 21 18:11:30 2010 +0100

            xinit: add dependency on util-linux-ng

        […]

tried to address the same problem but apparently did not help, because Tom still had problems.

[1] http://www.angstrom-distribution.org/demo/beagleboard/Angstrom-systemd-image-eglibc-ipk-v2011.11-core-beagleboard.rootfs.tar.bz2
[2] http://git.openembedded.org/openembedded/commit/443bcc0785bc004e471b3750a34d12d2fd2e5dad
[3] http://git.openembedded.org/openembedded/commit/7f6cec6f0adb6203a6dbaf8a43c67c2c4f8bf84e

Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-10 12:08:59 +00:00
Martin Jansa
55dcda0656 rgb: import from meta-oe layer
(From OE-Core rev: 805219204f81b80c6614aa23645e6960d33a25cc)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:23 +01:00
Martin Jansa
b887e7fd3f xorg-app-common: merge some changes from meta-oe
* use BPN directly instead of XORG_PN
* fix depends
* fix packaging
* add INC_PR (used by recipes in meta-oe now, but should be used here
  too)

(From OE-Core rev: fbf6dcefb719f992c8b7900aea9c719ce143d0b1)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:22 +01:00
Richard Purdie
dc9751dd2f x11perf: Packaged unpackaged files
(From OE-Core rev: ab9242965628a301b702d6c8426e59182655fabf)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-07 10:57:49 +01:00
Yu Ke
c6dac094ac xauth: upgrade from 1.05 to 1.06
(From OE-Core rev: 2b3bf5350861f62435e2fdf1c56c8a02f4b1b4ac)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-04 12:45:33 +01:00
Yu Ke
6a7b1fe1bb recipes: Add Upstream-Status for multiple recipes
iputils: update patch Upstream-Status
mktemp: update patch Upstream-Status
xinetd: update Upstream-Status
libdrm: update patch Upstream-Status
qemugl: update patch Upstream-Status
x11-common: update patch Upstream-Status
xorg-app: update patch Upstream-Status
xorg-driver: update patch Upstream-Status

(From OE-Core rev: 6c49b8e881bc811386c5f1ebac95829d44ad9bb3)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-13 10:28:59 +01:00
Yu Ke
77d2110452 xkbcomp: upgrade from 1.2.0 to 1.2.1
- Also remove the cross compiling patch, since it is already included
 in 1.2.1 release

(From OE-Core rev: 67e5286b931df3207f9bb44cd58f8aafa8c80f96)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-18 05:49:38 +01:00
Zhai Edwin
8ca68f6dff x11perf: Upgrade to 1.5.3 (from 1.5.2)
(From OE-Core rev: 8735ecfcaa4f3270fae8306055cb30fb7a179367)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-18 05:49:26 +01:00
Richard Purdie
095944add9 mkfontdir/font-alias: Fix native RDEPENDS
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-02-16 14:28:02 +00:00
Mark Hatle
9ee3c77f4e recipes-graphics: Add more detailed SUMMARY and DESCRIPTIONS
Add more detailed SUMMARY and DESCRIPTIONS to various graphics and
graphics related components.  I've recently gotten question from users
what something is, or why it was needed.. this should go a long way toward
answering those questions.

Many of the descriptions were taken directly from the upstream location,
where one was not available the Debian packages were consulted for
information.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2011-02-03 08:49:22 -08:00
Yu Ke
1029b86231 xwininfo: upgrade to 1.1.1
Signed-off-by: Yu Ke <ke.yu@intel.com>
2011-01-18 07:38:03 -08:00
Yu Ke
75e9e0af7a xkbcomp: upgrade to 1.2.0
- also pick one patch from upstream to fix the cross compiling error during the do_configure. it can be safely removed in the next upgrade.

Signed-off-by: Yu Ke <ke.yu@intel.com>
2011-01-18 07:38:02 -08:00
Yu Ke
2a69187e06 xdpyinfo: upgrade to 1.2.0
- update license checksume due to the commit "COPYING: replace stub with actual copyright notice". it provide more accurate license info. the license type is unchanged.

Signed-off-by: Yu Ke <ke.yu@intel.com>
2011-01-18 07:38:02 -08:00
Yu Ke
bacfa12b01 mkfontscale: upgrade to 1.0.8
- update license checksum, due to commit "Sun's copyrights now belong to Oracle". the license type is not changed.

Signed-off-by: Yu Ke <ke.yu@intel.com>
2011-01-18 07:38:02 -08:00
Yu Ke
00ecccca36 xprop: upgrade to 1.2.0
- LICENSE_CHECKSUM changed due to the commit "COPYING: replace stub with copyright notices". this commit add more accurate license info, and the license type is still MIT-X.

Signed-off-by: Yu Ke <ke.yu@intel.com>
2011-01-18 07:38:01 -08:00
Yu Ke
c39b3aa2c2 xinit: upgrade to 1.3.0
Signed-off-by: Yu Ke <ke.yu@intel.com>
2011-01-18 07:38:01 -08:00
Yu Ke
d7c300f1d1 mkfontdir: upgrade to 1.0.6
Signed-off-by: Yu Ke <ke.yu@intel.com>
2011-01-18 07:38:01 -08:00
Yu Ke
5f1d51e32c xhost: upgrade to 1.0.4
- LICENSE checksum changes due to that "Sun's copyrights now belong to Oracle". it is corp name change only, the license is still MIT-X.

Signed-off-by: Yu Ke <ke.yu@intel.com>
2011-01-18 07:38:01 -08:00
Richard Purdie
359e31c37e xvinfo: Fix LIC_FILES_CHKSUM
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-01-07 16:23:28 +00:00
Zhai Edwin
c19c5b49be xvinfo: Upgrade to 1.1.1
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
2011-01-06 10:06:25 +00:00
Koen Kooi
0e8f0f0a03 RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
For these recipes the dependencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN}

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-12-30 10:03:10 +00:00
Mark Hatle
cda749d2b8 recipes-graphics: Add SUMMARY and update DESCRIPTION
Add the missing SUMMARY fields and update DESCRIPTION fields if necessary

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2010-12-16 15:53:08 +00:00