1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Commit Graph

16884 Commits

Author SHA1 Message Date
Shane Wang fbf503aa9f minicom: upgrade to 2.6.1
(From OE-Core rev: 2ac64d0c351c63068a91fec5d73d848cfde8d173)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:45 +00:00
Shane Wang 87f284f70d apr: upgrade to 1.4.6
(From OE-Core rev: f79819fe3d78c1da74753174efbc2fb2b1239da0)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:45 +00:00
Shane Wang 5f83df6da1 dropbear: upgrade to 2012.55
(From OE-Core rev: 1804020514f122a3b3825c627e8eb51017425bbb)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:45 +00:00
Shane Wang dba0656c1b curl: upgrade to 7.24.0
(From OE-Core rev: ade51262effbf809c23bcf879ba43b7945e459ff)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:45 +00:00
Shane Wang b52bd42b63 busybox: upgrade to 1.19.4
Removing the patch busybox-1.19.3-getty.patch is because it is already in the upstream.

(From OE-Core rev: f03f8eac4c72be0f16468ebd0ee4dd1f07b0563b)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:44 +00:00
Shane Wang e556d90ca0 libpcap: upgrade to 1.2.1
(From OE-Core rev: 98b9c17f2c236e1a23d9c74d93cb693b4d7b4d61)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:44 +00:00
Shane Wang 52365cc45f gst-plugins-ugly: upgrade to 0.10.19
(From OE-Core rev: b42e6dbd4c3a780fd9221097b1719a1d62ce4284)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:44 +00:00
Shane Wang de0e3e5003 gst-plugins-bad: upgrade to 0.10.23
(From OE-Core rev: 42159daa98d17b301c1f64ef61c30c5fbd2a1f4c)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:44 +00:00
Saul Wold a25a6c6b58 gst-plugins-good: Fix packaging
WARNING: For recipe gst-plugins-base, the following files/directories were installed but not shipped in any package:
WARNING:   /usr/share/gst-plugins-base
WARNING:   /usr/share/gst-plugins-base/license-translations.dict

(From OE-Core rev: 29e37e599fedb355000f532a1607a92ebb3e275f)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:43 +00:00
Shane Wang fc44b2f181 gst-plugins-good: upgrade to 0.10.31
(From OE-Core rev: a28f20abe0457789b2bb3034635e41e0b2bbdba2)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:43 +00:00
Shane Wang 761b3c37d7 gst-plugins-base: upgrade to 0.10.36
(From OE-Core rev: 10c24f924f46784f91f1113aca6e18838aada0fd)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:43 +00:00
Shane Wang 7fffe07cfa gstreamer: upgrade to 0.10.36
(From OE-Core rev: f19fe90ef79f1311e38eaca7dfe7e5578139069f)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:43 +00:00
Saul Wold 1b083f36fa gst-plugin-bluetooth: Fix package warnings
WARNING: For recipe gst-plugin-bluetooth, the following files/directories were installed but not shipped in any package:
WARNING:   /var
WARNING:   /usr/lib/bluetooth
WARNING:   /usr/lib/bluetooth/plugins
WARNING:   /usr/lib/alsa-lib/libasound_module_pcm_bluetooth.so
WARNING:   /usr/lib/alsa-lib/libasound_module_ctl_bluetooth.so
WARNING:   /usr/lib/alsa-lib/libasound_module_ctl_bluetooth.la
WARNING:   /usr/lib/alsa-lib/libasound_module_pcm_bluetooth.la
WARNING:   /usr/share/alsa
WARNING:   /usr/share/alsa/bluetooth.conf
WARNING:   /var/lib
WARNING:   /var/lib/bluetooth

These are removed because they are packages in the bluez4 package

(From OE-Core rev: eae2b9c21e9d57ad192eeded4301b548f7e3d5b5)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:42 +00:00
Shane Wang 82df422ccd gst-plugin-bluetooth: upgrade to 4.99
(From OE-Core rev: ad9cdcffa219e2c185f0e40f50d44f63ed521c9c)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:42 +00:00
Shane Wang 24c233d8fd bluez-hcidump: upgrade to 2.3
(From OE-Core rev: b96700e2d788624248ef72d49da4296d6c58808e)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:42 +00:00
Shane Wang 11897a9300 bluez4: upgrade to 4.99
(From OE-Core rev: fac7863c0f00b442283689e27fae153ccf5428b0)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:42 +00:00
Shane Wang 987d53f5be ofono: upgrade to 1.5
(From OE-Core rev: 5624201471f9d3fb7c6d9858a40f63dd88354f94)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:41 +00:00
Saul Wold 7e1c71a3b0 telepathy-mission-control: fix package warnings
WARNING: For recipe telepathy-mission-control, the following files/directories were installed but not shipped in any package:
WARNING:   /usr/share/glib-2.0
WARNING:   /usr/share/glib-2.0/schemas
WARNING:   /usr/share/glib-2.0/schemas/im.telepathy.MissionControl.FromEmpathy.gschema.xml
(From OE-Core rev: 9a63238fe3802f3b9e94f90bb092c24cf20a40a5)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:41 +00:00
Shane Wang 44d6487f19 telepathy-mission-control: upgrade to 5.11.0
(From OE-Core rev: dfa9defe54d35e309e0a2a47076692c775488c7b)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:41 +00:00
Shane Wang fc876faa1c telepathy-glib: upgrade to 0.17.5
(From OE-Core rev: f0481bcc1866c9ead0febd7b7c8355e8416bb2c4)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:40 +00:00
Shane Wang 9cb35be509 tremor: upgrade to 18221
(From OE-Core rev: 2ef8cfa58d0bfca1b9bf6a204ae4a05d6e3af03f)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:40 +00:00
Shane Wang 704284ee0f libvorbis: upgrade to 1.3.3
(From OE-Core rev: 5205af02970fbbf7c2f9b945f38685e0ef283d6a)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:40 +00:00
Shane Wang 14df794d21 glproto: update its info in distro tracking
(From OE-Core rev: 8631db2811a2d51a76a1d76ace425c55fc1858ac)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:40 +00:00
Shane Wang 6e5446cda6 gdk-pixbuf: upgrade to 2.24.1
(From OE-Core rev: a9c128897e7fa496cf8f297819b64bdc7b8c319c)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:39 +00:00
Dongxiao Xu 9963fdb3d1 dbus-glib: upgrade to 0.98
(From OE-Core rev: 4634aa0fabb9646ba61597cb81f74a242144cd14)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:39 +00:00
Shane Wang 3510a59183 glib-2.0: upgrade to 2.30.3
(From OE-Core rev: 19e041720699776c58280d07d5bf5f18246a42d9)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:39 +00:00
Lauri Hintsala 224ff370b4 xserver-kdrive: compile xserver without dtrace support
Cross compiling of xserver-kdrive fails if dtrace is enabled. Configure
script enables dtrace automatically if dtrace binary exists. xserver-kdrive
compiling was failed if systemtap package was builded beforehand because
systemtap provides dtrace binary.

(From OE-Core rev: 5d404fdb36b0535ce758d98408b02134cdbce4ee)

Signed-off-by: Lauri Hintsala <lauri.hintsala@bluegiga.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:39 +00:00
Lianhao Lu 17d42a4682 sysvinit-inittab: Fixed license warning.
WARNING: .../sysvinit-inittab-2.88dsf-r6/sysvinit-2.88dsf/COPYING could
not be copied for some reason. It may not exist. WARN for now.

(From OE-Core rev: 85e4d0c4bb024a67b61afb0f0fedfb15d6aa0d18)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:38 +00:00
Dongxiao Xu 5b09f2c25c Hob: save CONF_VERSION and LCONF_VERSION into template
To pass the sanity check, we need to define CONF_VERSION and
LCONF_VERSION in local.conf and bblayers.conf.

[YOCTO #2119]

(Bitbake rev: d595960fea0988df9004d927bc2ec3439540dd9c)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:37 +00:00
Dongxiao Xu d03856c611 Hob: Fix advanced setting reparse mechanism
When judging if reparse is needed when change values in advanced
setting, we need also include user's own defined variable pairs.

[YOCTO #2121]

(Bitbake rev: db4b78798e2280736ddce9f54d25cbcdcb779d0a)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:37 +00:00
Dongxiao Xu 34b0f7ac3d Hob: reset the selection if switch to a new base image
(Bitbake rev: 947f1a3cb7ca81608fd04b7a5d7ced5f4da47d05)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:36 +00:00
Richard Purdie 8a2f86ad90 utils: Add split_version function for splitting a version into its components
(Bitbake rev: b7b7c768761d205bc5a60922ff709c9c184d4158)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:36 +00:00
Joshua Lock d8b3caa085 ui/crumbs/persistenttooltip: try to reflect WM close button position
When the user is running a desktop where the close button is on the left we
try to detect that and position the tooltip close button appropriately.
Where we can't easily determine this we default to placing the close button
on the right.

Tested on Ubuntu/Unity and Fedora/Gnome Shell.

(Bitbake rev: 09147098a63c33dc05dc39b7fe4da4df8e2dbd4c)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:36 +00:00
Joshua Lock 854f3a521a ui/crumbs/hobpage: no need to force a Toolbar button type
This uses a more concise API that will be more flexible whent he Toolbar
style is updated to match the visual design.

(Bitbake rev: 6491b5fd877d6006ebc91e0c73d443a6e7626f3f)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:36 +00:00
Joshua Lock 740bd44c5a ui/crumbs: remove unused return value from append_toolbar_button
No caller of the method uses the returned toolbar variable

(Bitbake rev: 77ed4bb3468d5d256f08329fd307df5a219ae242)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:35 +00:00
Joshua Lock 1aa102b39e ui/crumbs/hig: use close rather than OK for dismis button
Dialogue buttons should have descriptive names

(Bitbake rev: 7b28ed7dfa59d9e7cec662159113a03633f8bb36)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:35 +00:00
Liming An f1c35a6ad3 Hob: fixed the tabbar search entry retaining focus when user has clicked off it issue
Add reset focus code to fixed the search entry retaining focus issue

(From Poky rev: 75969f92af4b0aae25dcaa3321f835dd729f4bf9)

(Bitbake rev: 0531730b255f41b2804bcd322e10c52cbf13537a)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:35 +00:00
Liming An 89a5428cc1 Hob: fix static variable "self.search" to parameter "search" in signal callback function
To fix the signal callback function code, and make the temp parameter to replaced the static global variable, as required.

(From Poky rev: a95b61d48bf92948ff5a21896e71ed3cb323ab38)

(Bitbake rev: 76f63e70c7b2d6291f8b11bc5baebda510a276d7)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:35 +00:00
Liming An 2abdbaa150 Hob: change HobNoteBook tab edge color from green to gray
To change the notebook tab pressed edge color from green to gray.

(From Poky rev: 8e454749e7f535cf43544eeb167c90632e89cfb0)

(Bitbake rev: 8e4e868e6183fbd52fa455937bb824a52ef15ab5)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:34 +00:00
Liming An 74c00988be Hob: add auto adjust background area function for long issue text
To add auto expand the background area function for long issue text input.

(From Poky rev: f1822f0961bd719de0827e361f7e6fa3bf872746)

(Bitbake rev: f406b0a11b021f8492ed0b083d9ff89de4a14653)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:34 +00:00
Liming An 5e0461c0e0 Hob: Fixed the hobwidget code and make it like a pythonista
fixed the 'for..in..' range dance code, and use the 'iterator' approach to replaced the index for quote the 'children' list

(From Poky rev: 74e7286a4e875eda5e8abeb5db1015031d21c35f)

(Bitbake rev: 3dc443663b97515a54b70c9047a9b22c6b8a0c14)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:34 +00:00
Liming An 4dc552a216 Hob: remove the invalid code in hobwidget.py
To delete some code which is not used

(From Poky rev: a8f5a72d36e9a55ec7a2296e1c9623e177a95a74)

(Bitbake rev: 27e77f6c196e313b5b941238e54b74fc746a0230)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:34 +00:00
Shane Wang 491c87d167 Hob: fix '!= None' and '== None' in the code
This patch is to fix the following:

if foo != None -----> if foo
if foo == None -----> if not foo

(From Poky rev: d771343b1726f166ed8d75543ba68bd2a20aee7b)

(Bitbake rev: 23c140a4d00293d922cbd34b6b837493cac2e93a)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:33 +00:00
Shane Wang 9ecdbc377c Hob: change the code style to enumerate a list in a for-loop
We use the more common style to enumerate a list in a for-loop
(http://docs.python.org/library/functions.html#enumerate), that is:

try to use
for item in mylist,

and try to use
for i, item in enumerate(list)
rather than
for i in range(len(mylist))

(From Poky rev: 33c21bc60bd1542f81d33c328f116dec424728cd)

(Bitbake rev: 9b168239a5d9693573438eb6514938b81de85af3)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:33 +00:00
Shane Wang dab638e150 Hob: show indicators on the tabs of the Hob notebook
This patch is to show the indicators (e.g., the number of the issues) in the build details page to highlight.

(From Poky rev: 2e08a8e6818b8f1df7eaac499ebc3a5854efe7be)

(Bitbake rev: f2eead1bc20c48b2f36e880a879a5a50e6e6567b)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:33 +00:00
Shane Wang c4017bc518 Hob: use HobNotebook to implement a notebook in build details page
This patch is to use HobNotebook we defined to implement the notebook in the build details page.

(From Poky rev: 792c5eb29cf44d9ef559ae59802327fb1bb2cb3c)

(Bitbake rev: d51ad20aa00f2af6c7174910b31523fff0e5a639)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:33 +00:00
Shane Wang 88bbc0ce56 Hob: implement a self-defined notebook visual component for Hob
In recipe selection page, package selection page, and build details page, etc, there is a notebook component which is not gtk.Notebook in the design video.
We implement the visual component with a drawing area, and use it to replace the old notebook in recipe selection page and package selection page. The reasons why we do it are:

1) General speaking, gtk.Notebook doesn't look like the designer worked out. (see https://wiki.yoctoproject.org/wiki/File:Hob1.2-screencast2.mov)
2) And the designer version looks better, for example, there is an indicator to show how many recipes or packages are included, and how many issues happened when building? Very straightforward.
But technically, gtk.Notebook can't implement that, as far as we know.
3) Moreover, there is an entry for "search recipes", and "search packages". How to make it horizontal to the tabs is a problem to us.

Regarding those, we give up gtk.Notebook and use our own.

(From Poky rev: e4ebac226cc5e4589bcecd8bada9fde462e925cc)

(Bitbake rev: b0c2ca3f600694c6d37924006de3f9474b2a9a8e)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:32 +00:00
Robert P. J. Day 8b206d38c7 Typo: "nonexistant" -> "non-existent"
(Bitbake rev: c4c8df0e1e77f99f3ee0b07e1748116fc362819f)

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:32 +00:00
Eric Bénard 30ff27a71b runningbuild.py: fix goggle ui
* goggle ui actually fails with :
Traceback (most recent call last):
  File ".../bitbake/lib/bb/ui/goggle.py", line 35, in event_handle_idle_func
    build.handle_event (event, pbar)
  File ".../bitbake/lib/bb/ui/crumbs/runningbuild.py", line 234, in handle_event
    pbar.update(0, None, bb.event.getName(event))
TypeError: update() takes exactly 3 arguments (4 given)

(Bitbake rev: 815c113120b73331ecf32d6f57bc034f379bed43)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:32 +00:00
Paul Eggleton 30e35fa094 bitbake-layers: fix traceback in show-overlayed with nothing overlayed
There is no logger.note, use logger.plain instead (which is what we
really want here anyway.)

(Bitbake rev: c4f7fd708c48d4323db4bbeb3074f576f5be7aa2)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-20 15:21:32 +00:00