2011-11-22converted ServicePublisher.py to unix line ending
Edouard Tisserant [Tue, 22 Nov 2011 02:07:00 +0100] rev 647
converted ServicePublisher.py to unix line ending

2011-11-22added periodic retry for zeroconf, in case network interface is not ready
Edouard Tisserant [Tue, 22 Nov 2011 02:06:15 +0100] rev 646
added periodic retry for zeroconf, in case network interface is not ready

2011-11-21ServicePublisher.py was missing in previous commit
Edouard Tisserant [Mon, 21 Nov 2011 15:18:51 +0100] rev 645
ServicePublisher.py was missing in previous commit

2011-11-21Better naming of IP address related variables in Beremiz_service.py, Ignore errors that occur on shutdown in Zeroconf.py, fixed discovery dialog crash due to asynchronous call from zeroconf
Edouard Tisserant [Mon, 21 Nov 2011 11:40:29 +0100] rev 644
Better naming of IP address related variables in Beremiz_service.py, Ignore errors that occur on shutdown in Zeroconf.py, fixed discovery dialog crash due to asynchronous call from zeroconf

2011-11-20Fixed typo in /runtime/ServicePublisher
Edouard Tisserant [Sun, 20 Nov 2011 18:14:04 +0100] rev 643
Fixed typo in /runtime/ServicePublisher

2011-11-19various cleanups in /targets
Edouard Tisserant [Sat, 19 Nov 2011 21:52:34 +0100] rev 642
various cleanups in /targets

2011-11-18Fixed encoding of Beremiz_service.py
Edouard Tisserant [Fri, 18 Nov 2011 23:54:03 +0100] rev 641
Fixed encoding of Beremiz_service.py

2011-11-18Fixed file attributes on Beremiz.py and Beremiz_service.py
Edouard Tisserant [Fri, 18 Nov 2011 18:40:19 +0100] rev 640
Fixed file attributes on Beremiz.py and Beremiz_service.py

2011-11-18Fixing bug that prevent to use global variables in configuration
laurent [Fri, 18 Nov 2011 17:33:19 +0100] rev 639
Fixing bug that prevent to use global variables in configuration

2011-11-18Fixing python plugin function block code to follow new macros defined in matiec accessor.h for setting variables
laurent [Fri, 18 Nov 2011 17:32:57 +0100] rev 638
Fixing python plugin function block code to follow new macros defined in matiec accessor.h for setting variables

2011-11-16Fixing bug preventing copy/cut/paste using shortcuts on CFileEditor text editors
laurent [Wed, 16 Nov 2011 23:30:17 +0100] rev 637
Fixing bug preventing copy/cut/paste using shortcuts on CFileEditor text editors

2011-11-16Fixing refresh of notebook tab titles after project save
laurent [Wed, 16 Nov 2011 23:28:42 +0100] rev 636
Fixing refresh of notebook tab titles after project save

2011-11-16added -fPIC to satisfy X86_64 build
Edouard Tisserant [Wed, 16 Nov 2011 17:47:13 +0100] rev 635
added -fPIC to satisfy X86_64 build

2011-11-16fixed redondant ldflag and a typo in xenomai build
Edouard Tisserant [Wed, 16 Nov 2011 17:12:16 +0100] rev 634
fixed redondant ldflag and a typo in xenomai build

2011-11-16Xenomai build now ignores xeno-config if not set
Edouard Tisserant [Wed, 16 Nov 2011 12:50:16 +0100] rev 633
Xenomai build now ignores xeno-config if not set

2011-11-08Merging with Edouard's modifications
laurent [Tue, 08 Nov 2011 22:39:44 +0100] rev 632
Merging with Edouard's modifications

2011-11-08Fixing bug in project modified state not well reported when modifications made in plugins informations
laurent [Tue, 08 Nov 2011 22:04:07 +0100] rev 631
Fixing bug in project modified state not well reported when modifications made in plugins informations

2011-11-08Including external tools for editing plugin informations into Beremiz window
laurent [Tue, 08 Nov 2011 22:01:39 +0100] rev 630
Including external tools for editing plugin informations into Beremiz window

2011-10-17fix unnecessary CanFestival plugin load in lpcberemiz
Edouard Tisserant [Mon, 17 Oct 2011 21:43:20 +0200] rev 629
fix unnecessary CanFestival plugin load in lpcberemiz

2011-10-17Merging with Edouard's modifications
laurent [Mon, 17 Oct 2011 09:04:13 +0200] rev 628
Merging with Edouard's modifications

2011-10-14Fix bug frame title not refreshed when the plugin attributes are modified
laurent [Fri, 14 Oct 2011 23:54:00 +0200] rev 627
Fix bug frame title not refreshed when the plugin attributes are modified

2011-10-14Adding support for using keyboard to edit cfile interface variables displayed in Grid
laurent [Fri, 14 Oct 2011 19:27:22 +0200] rev 626
Adding support for using keyboard to edit cfile interface variables displayed in Grid

2011-10-13Fixed LPCBeremiz to refect recent root plugin build method name to change
Edouard Tisserant [Thu, 13 Oct 2011 13:49:40 +0200] rev 625
Fixed LPCBeremiz to refect recent root plugin build method name to change

2011-10-09Updated console messages for build and stop
Edouard Tisserant [Mon, 10 Oct 2011 00:19:40 +0200] rev 624
Updated console messages for build and stop

2011-10-09A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant [Sun, 09 Oct 2011 23:30:18 +0200] rev 623
A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect

2011-10-06runtime's process cwd should now be the same as provided working dir, fixin permission problem on W7
Edouard Tisserant [Thu, 06 Oct 2011 22:39:05 +0200] rev 622
runtime's process cwd should now be the same as provided working dir, fixin permission problem on W7

2011-09-30Default gcc toolchain config now use 'gcc' for linking. Was left accidentally to g++ since old times of wxSVG based SVGUI. Cleaned up gcc parameters when linking
Edouard Tisserant [Fri, 30 Sep 2011 23:41:46 +0200] rev 621
Default gcc toolchain config now use 'gcc' for linking. Was left accidentally to g++ since old times of wxSVG based SVGUI. Cleaned up gcc parameters when linking

2011-09-30Reverted win32 target default configuration to default gcc toolchain congig
Edouard Tisserant [Fri, 30 Sep 2011 23:06:56 +0200] rev 620
Reverted win32 target default configuration to default gcc toolchain congig

2011-09-30Fixes after moving xmlclass and docutils into plcopeneditor
laurent [Fri, 30 Sep 2011 17:12:27 +0200] rev 619
Fixes after moving xmlclass and docutils into plcopeneditor

2011-09-27Fixed wrong bug report email
Edouard Tisserant [Tue, 27 Sep 2011 18:27:14 +0200] rev 618
Fixed wrong bug report email

2011-09-25fixed debug with xenomai, fixed unprotected access to ___debug_tick
Edouard Tisserant [Mon, 26 Sep 2011 00:24:04 +0200] rev 617
fixed debug with xenomai, fixed unprotected access to ___debug_tick

2011-09-25Xenomai Fix : runs, but still fail in debug
Edouard Tisserant [Sun, 25 Sep 2011 22:51:51 +0200] rev 616
Xenomai Fix : runs, but still fail in debug

2011-09-22Xenomai Fix : build
Edouard Tisserant [Thu, 22 Sep 2011 17:35:29 +0200] rev 615
Xenomai Fix : build

2011-09-22added return type to suspendDebug
Edouard Tisserant [Thu, 22 Sep 2011 17:33:34 +0200] rev 614
added return type to suspendDebug

2011-09-22fixed warnings in plc_python.c
Edouard Tisserant [Thu, 22 Sep 2011 17:00:56 +0200] rev 613
fixed warnings in plc_python.c

2011-09-22silence warnings while importing twisted
Edouard Tisserant [Thu, 22 Sep 2011 16:59:59 +0200] rev 612
silence warnings while importing twisted

2011-09-08Fix debugger bug after merging matiec repositories
laurent [Thu, 08 Sep 2011 20:25:44 +0200] rev 611
Fix debugger bug after merging matiec repositories

2011-09-07Disabling definition of enumerated and structure variables for interfacing with PLC in c_ext plug-in
laurent [Wed, 07 Sep 2011 16:01:13 +0200] rev 610
Disabling definition of enumerated and structure variables for interfacing with PLC in c_ext plug-in

2011-06-23changed bugreport address
Edouard Tisserant [Fri, 24 Jun 2011 01:17:07 +0200] rev 609
changed bugreport address

2011-06-23Updated release : Summer 2011 - 1.02 bugfix release
Edouard Tisserant [Thu, 23 Jun 2011 17:51:28 +0200] rev 608
Updated release : Summer 2011 - 1.02 bugfix release

2011-05-24Bug when changing parameters in TargetType section in Beremiz project configuration fixed
laurent [Tue, 24 May 2011 11:27:00 +0200] rev 607
Bug when changing parameters in TargetType section in Beremiz project configuration fixed

2011-05-23Fixed runtime with twisted but without Wx (-x 0 -t 1), made non-Zeroconf a default option, i.e when -n not specified
Edouard Tisserant [Tue, 24 May 2011 00:36:08 +0200] rev 606
Fixed runtime with twisted but without Wx (-x 0 -t 1), made non-Zeroconf a default option, i.e when -n not specified

2011-05-18debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant [Wed, 18 May 2011 14:46:27 +0200] rev 605
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision

2011-05-18memory located variables no behave like outputs, when forced
Edouard Tisserant [Wed, 18 May 2011 11:22:48 +0200] rev 604
memory located variables no behave like outputs, when forced

2011-05-18added memory location support to C file pluguin
Edouard Tisserant [Wed, 18 May 2011 11:21:10 +0200] rev 603
added memory location support to C file pluguin

2011-05-16Merged with Edouard's modifications
laurent [Mon, 16 May 2011 12:41:23 +0200] rev 602
Merged with Edouard's modifications

2011-05-16Fix bug when debugging located variables of type memory (%M)
laurent [Mon, 16 May 2011 11:58:06 +0200] rev 601
Fix bug when debugging located variables of type memory (%M)

2011-04-26Print binary size only in LPCBeremiz
Edouard Tisserant [Tue, 26 Apr 2011 16:27:54 +0200] rev 600
Print binary size only in LPCBeremiz

2011-04-21Adding save project before building on LPCBeremiz
laurent [Thu, 21 Apr 2011 12:35:27 +0200] rev 599
Adding save project before building on LPCBeremiz

2011-04-21Adding support for saving frame size while closing and restore it at next launch
laurent [Thu, 21 Apr 2011 11:06:43 +0200] rev 598
Adding support for saving frame size while closing and restore it at next launch

2011-04-19Fix bug in LPCBeremiz marking any newly opened project as modified
laurent [Tue, 19 Apr 2011 15:28:35 +0200] rev 597
Fix bug in LPCBeremiz marking any newly opened project as modified

2011-04-19Adding warning message on LPCBeremiz when closing frame and program not saved
laurent [Tue, 19 Apr 2011 11:52:49 +0200] rev 596
Adding warning message on LPCBeremiz when closing frame and program not saved

2011-04-04Added support for handling ANY_DATE types in debugger type translation
Edouard Tisserant [Mon, 04 Apr 2011 11:07:53 +0200] rev 595
Added support for handling ANY_DATE types in debugger type translation

2011-04-01Bug in translation from timedelta to timespec fixed
laurent [Fri, 01 Apr 2011 17:23:04 +0200] rev 594
Bug in translation from timedelta to timespec fixed

2011-04-01fixed typo in latest debugger changes
edouard [Fri, 01 Apr 2011 16:17:38 +0200] rev 593
fixed typo in latest debugger changes

2011-03-31Initial TIME support in debugger
Edouard Tisserant [Thu, 31 Mar 2011 19:09:49 +0200] rev 592
Initial TIME support in debugger

2011-03-31old typo
Edouard Tisserant [Thu, 31 Mar 2011 19:04:03 +0200] rev 591
old typo

2011-03-31Added build shortcut
Edouard Tisserant [Thu, 31 Mar 2011 18:43:41 +0200] rev 590
Added build shortcut

2011-03-31Adding support for disable language translation when default language not available in locale
laurent [Thu, 31 Mar 2011 12:09:38 +0200] rev 589
Adding support for disable language translation when default language not available in locale

2011-03-28spring 2011 - 1.01 bugfix release
Edouard Tisserant [Mon, 28 Mar 2011 11:42:06 +0200] rev 588
spring 2011 - 1.01 bugfix release

2011-03-28Restore RefreshFileMenu in CFileEditor
Edouard Tisserant [Mon, 28 Mar 2011 11:42:00 +0200] rev 587
Restore RefreshFileMenu in CFileEditor

2011-03-27Merged with Edouard's modifications
laurent [Sun, 27 Mar 2011 16:16:55 +0200] rev 586
Merged with Edouard's modifications

2011-03-27Bug in CFileEditor calling refresh of not used FileMenu fixed
laurent [Sun, 27 Mar 2011 15:57:05 +0200] rev 585
Bug in CFileEditor calling refresh of not used FileMenu fixed

2011-03-26file menu with Save implementation in c_ext plugin
Edouard Tisserant [Sat, 26 Mar 2011 22:53:10 +0100] rev 584
file menu with Save implementation in c_ext plugin

2011-03-26Fixed exception when adding variables in C_ext plugin
Edouqrd Tisserant <edouard.tisserant@gmail.com> [Sat, 26 Mar 2011 18:50:51 +0100] rev 583
Fixed exception when adding variables in C_ext plugin

2011-03-25Fix typo in plc_debug.c
Edouqrd Tisserant <edouard.tisserant@gmail.com> [Fri, 25 Mar 2011 17:43:40 +0100] rev 582
Fix typo in plc_debug.c

2011-03-16Also retain when debugger is stalled
edouard [Wed, 16 Mar 2011 18:01:07 +0100] rev 581
Also retain when debugger is stalled

2011-03-16More robust retain buffer validity management
edouard [Wed, 16 Mar 2011 17:26:54 +0100] rev 580
More robust retain buffer validity management

2011-02-24Retain variable for LPC
edouard [Thu, 24 Feb 2011 15:54:45 +0100] rev 579
Retain variable for LPC

2011-02-23Making debugger more stable with LPC
edouard [Wed, 23 Feb 2011 16:54:29 +0100] rev 578
Making debugger more stable with LPC

2011-02-22LPC : Completed initial debug support
edouard [Tue, 22 Feb 2011 14:11:50 +0100] rev 577
LPC : Completed initial debug support

2011-02-18Some typo fixes to make debug related methods in LPCAppOject stop throwing exceptions, less agressive error message when unplugging LPC
edouard [Fri, 18 Feb 2011 12:29:48 +0100] rev 576
Some typo fixes to make debug related methods in LPCAppOject stop throwing exceptions, less agressive error message when unplugging LPC

2011-02-17Removed status polling for LPC, as status cannot change by itself, fixed MD5 comparison in app mode
edouard [Thu, 17 Feb 2011 17:34:29 +0100] rev 575
Removed status polling for LPC, as status cannot change by itself, fixed MD5 comparison in app mode

2011-02-17Prevent status polling to generate an error while PLC is being reset to bootloader mode
edouard [Thu, 17 Feb 2011 17:04:10 +0100] rev 574
Prevent status polling to generate an error while PLC is being reset to bootloader mode

2011-02-17Fixed MD5 computation for makefile based toolchain, helps avoiding unnecessary builds - continued
edouard [Thu, 17 Feb 2011 16:38:42 +0100] rev 573
Fixed MD5 computation for makefile based toolchain, helps avoiding unnecessary builds - continued

2011-02-17Fixed MD5 computation for makefile based toolchain, helps avoiding unnecessary builds
edouard [Thu, 17 Feb 2011 15:59:56 +0100] rev 572
Fixed MD5 computation for makefile based toolchain, helps avoiding unnecessary builds

2011-02-17Debug switch (file in CWD). LPC : better MD5 handling, Run button in boot mode, handling data feedback in boot protocol
edouard [Thu, 17 Feb 2011 10:11:04 +0100] rev 571
Debug switch (file in CWD). LPC : better MD5 handling, Run button in boot mode, handling data feedback in boot protocol

2011-02-03LPC application mode IDLE comamnd is now the same as PLCID (0x07)
Edouqrd Tisserant <edouard.tisserant@gmail.com> [Thu, 03 Feb 2011 18:23:24 +0100] rev 570
LPC application mode IDLE comamnd is now the same as PLCID (0x07)

2011-02-03LPC program transfer more verbose, test code added in __main__ of LPCBootProto
Edouqrd Tisserant <edouard.tisserant@gmail.com> [Thu, 03 Feb 2011 18:20:47 +0100] rev 569
LPC program transfer more verbose, test code added in __main__ of LPCBootProto

2011-02-01Moved locales out of platform agnostic C template
edouard [Tue, 01 Feb 2011 17:28:41 +0100] rev 568
Moved locales out of platform agnostic C template

2011-02-01keep LPC in boot mode to give a chance to ask for a transfer
edouard [Tue, 01 Feb 2011 11:05:07 +0100] rev 567
keep LPC in boot mode to give a chance to ask for a transfer

2010-11-17Fix bug in LPCBeremiz that use input retrieve and publish code for ouput with the same location
laurent [Wed, 17 Nov 2010 08:30:35 +0100] rev 566
Fix bug in LPCBeremiz that use input retrieve and publish code for ouput with the same location

2010-08-19Adding german translations (thanks to anonymous contributor)
laurent [Thu, 19 Aug 2010 16:08:12 +0200] rev 565
Adding german translations (thanks to anonymous contributor)

2010-06-04merge
ed [Fri, 04 Jun 2010 17:36:11 +0200] rev 564
merge

2010-06-04Better serial comm handling in LPC connector
Lolitech [Fri, 04 Jun 2010 16:11:19 +0200] rev 563
Better serial comm handling in LPC connector

2010-06-04Fix MatchMD5 result if no serial connection available
laurent [Fri, 04 Jun 2010 17:04:25 +0200] rev 562
Fix MatchMD5 result if no serial connection available

2010-06-04Fix bug on LPCConnector initial value
laurent [Fri, 04 Jun 2010 15:39:14 +0200] rev 561
Fix bug on LPCConnector initial value

2010-06-04Fix transfer button enable state and build button state
laurent [Fri, 04 Jun 2010 15:35:28 +0200] rev 560
Fix transfer button enable state and build button state

2010-06-04Fix buttons state according to online mode
laurent [Fri, 04 Jun 2010 15:17:48 +0200] rev 559
Fix buttons state according to online mode

2010-06-04(no commit message)
Lolitech [Fri, 04 Jun 2010 15:16:23 +0200] rev 558
(no commit message)

2010-06-04Removed PLCprint, not existing in LPC connector context.
Lolitech [Fri, 04 Jun 2010 15:11:27 +0200] rev 557
Removed PLCprint, not existing in LPC connector context.

2010-06-04LPC Composer don't send comma at the end of serial port name.
Lolitech [Fri, 04 Jun 2010 14:59:11 +0200] rev 556
LPC Composer don't send comma at the end of serial port name.

2010-06-04Disabled logging commands into files
Lolitech [Fri, 04 Jun 2010 14:58:24 +0200] rev 555
Disabled logging commands into files

2010-06-04Fixed PLC status bytes values
Lolitech [Fri, 04 Jun 2010 14:58:03 +0200] rev 554
Fixed PLC status bytes values

2010-06-04Move init code from variable to module
laurent [Fri, 04 Jun 2010 13:47:02 +0200] rev 553
Move init code from variable to module

2010-06-04Bug with recv from socket fixed
laurent [Fri, 04 Jun 2010 13:09:35 +0200] rev 552
Bug with recv from socket fixed

2010-06-04Adding support for command line communication by socket instead of stdin/stdout
laurent [Fri, 04 Jun 2010 11:27:00 +0200] rev 551
Adding support for command line communication by socket instead of stdin/stdout

2010-06-04Adding support for initialize all LPC module variables even if not used
laurent [Fri, 04 Jun 2010 09:02:22 +0200] rev 550
Adding support for initialize all LPC module variables even if not used

2010-06-03Fixed bug on frame close.
Lolitech [Thu, 03 Jun 2010 17:26:47 +0200] rev 549
Fixed bug on frame close.

2010-06-03Some fixes in LPCApp{Obj,Proto}, to be continued.
Lolitech [Thu, 03 Jun 2010 17:23:11 +0200] rev 548
Some fixes in LPCApp{Obj,Proto}, to be continued.

2010-06-03Reorganization of threading for command line and wx main loops. Commands are now cleanly serialized through calls to wx.CallAfter. wx mainloop now runs on main thread.
Lolitech [Thu, 03 Jun 2010 17:21:40 +0200] rev 547
Reorganization of threading for command line and wx main loops. Commands are now cleanly serialized through calls to wx.CallAfter. wx mainloop now runs on main thread.

2010-06-03Safer passing of PLC ID to make command line.
Lolitech [Thu, 03 Jun 2010 17:17:51 +0200] rev 546
Safer passing of PLC ID to make command line.

2010-06-03Refactored LPC connector for new bootloader and application modes
Lolitech [Thu, 03 Jun 2010 12:57:28 +0200] rev 545
Refactored LPC connector for new bootloader and application modes

2010-06-03Removed boring PLC/build compare messages.
Lolitech [Thu, 03 Jun 2010 12:56:21 +0200] rev 544
Removed boring PLC/build compare messages.

2010-06-03Disabled boring standard conformance checks, fixed possible race condition with StatusTimer, fixed warning message in AbortTransfer
Lolitech [Thu, 03 Jun 2010 12:54:45 +0200] rev 543
Disabled boring standard conformance checks, fixed possible race condition with StatusTimer, fixed warning message in AbortTransfer

2010-06-02changes merged
laurent [Wed, 02 Jun 2010 16:53:38 +0200] rev 542
changes merged

2010-06-02Adding compile button when unconnected
laurent [Wed, 02 Jun 2010 16:52:58 +0200] rev 541
Adding compile button when unconnected

2010-06-02Overloaded GetBinaryCode in LPC connector returns ready to send over serial binary
Lolitech [Wed, 02 Jun 2010 16:40:06 +0200] rev 540
Overloaded GetBinaryCode in LPC connector returns ready to send over serial binary

2010-06-02Modifying LPCBeremiz to launch silently a frame and show or hide it on demand.
laurent [Wed, 02 Jun 2010 16:35:00 +0200] rev 539
Modifying LPCBeremiz to launch silently a frame and show or hide it on demand.
Adding support for transferring LPC programs.

2010-06-02Moved LPC specific code from toolchain_makefile into LPC target, added FROM_BEREMIZ variable to tell LPC's makefile it is invoked from here.
edouard [Wed, 02 Jun 2010 10:08:58 +0200] rev 538
Moved LPC specific code from toolchain_makefile into LPC target, added FROM_BEREMIZ variable to tell LPC's makefile it is invoked from here.

2010-06-01merge
Lolitech@ACER9810.smarteh.local [Tue, 01 Jun 2010 13:08:13 +0200] rev 537
merge

2010-06-01Cosmetix fixes for LPC tests/build
Lolitech [Tue, 01 Jun 2010 11:24:09 +0200] rev 536
Cosmetix fixes for LPC tests/build

2010-06-01merge with forgoten rev
lolitech@ks351503.kimsufi.com [Tue, 01 Jun 2010 10:03:58 +0200] rev 535
merge with forgoten rev

2009-12-16Bug on FileMenu not refreshed when modifications fixed
laurent [Wed, 16 Dec 2009 15:21:17 +0100] rev 534
Bug on FileMenu not refreshed when modifications fixed

2009-12-25Christmas 2009 release
Edouard TISSERANT <edouard.tisserant@gmail.com> [Fri, 25 Dec 2009 13:08:20 +0100] rev 533
Christmas 2009 release

2009-12-23Fixed startin debugger with non empty debug variable list
Edouard TISSERANT <edouard.tisserant@gmail.com> [Wed, 23 Dec 2009 22:23:02 +0100] rev 532
Fixed startin debugger with non empty debug variable list

2009-12-16Changes merged
laurent [Wed, 16 Dec 2009 15:09:12 +0100] rev 531
Changes merged

2009-12-16Bug when trying to generate LPCBus code fixed
laurent [Wed, 16 Dec 2009 15:08:38 +0100] rev 530
Bug when trying to generate LPCBus code fixed

2009-12-16Bug when try to SaveAs on Windows fixed
laurent [Wed, 16 Dec 2009 15:07:47 +0100] rev 529
Bug when try to SaveAs on Windows fixed

2009-12-16merge
Edouard TISSERANT <edouard.tisserant@gmail.com> [Wed, 16 Dec 2009 14:53:36 +0100] rev 528
merge