Tue, 14 Jun 2011 17:15:47 +0200Fix bug with array attribute in structure declaration
laurent [Tue, 14 Jun 2011 17:15:47 +0200] rev 322
Fix bug with array attribute in structure declaration

Tue, 14 Jun 2011 14:53:37 +0100Add better comments, and change name of functions to clarify what they do.
Mario de Sousa <msousa@fe.up.pt> [Tue, 14 Jun 2011 14:53:37 +0100] rev 321
Add better comments, and change name of functions to clarify what they do.

Fri, 10 Jun 2011 08:47:38 +0100Remove incorect debugging assertion.
Mario de Sousa <msousa@fe.up.pt> [Fri, 10 Jun 2011 08:47:38 +0100] rev 320
Remove incorect debugging assertion.

Fri, 10 Jun 2011 06:30:30 +0100Skip CONFIGURATION declarations in stage 3 for now, so semantic analysis does not stop when a configuration is encountered.
Mario de Sousa <msousa@fe.up.pt> [Fri, 10 Jun 2011 06:30:30 +0100] rev 319
Skip CONFIGURATION declarations in stage 3 for now, so semantic analysis does not stop when a configuration is encountered.

Thu, 09 Jun 2011 17:51:00 +0200Fix bug when generating initial value for function return type when it is a complex type
laurent [Thu, 09 Jun 2011 17:51:00 +0200] rev 318
Fix bug when generating initial value for function return type when it is a complex type

Thu, 09 Jun 2011 17:47:57 +0200Fix bug in debugging variable list compilation with structure and array disabling
laurent [Thu, 09 Jun 2011 17:47:57 +0200] rev 317
Fix bug in debugging variable list compilation with structure and array disabling

Wed, 08 Jun 2011 18:34:53 +0200Fix bug with TRUNC function and with type conversion functions called with constant as parameter
laurent [Wed, 08 Jun 2011 18:34:53 +0200] rev 316
Fix bug with TRUNC function and with type conversion functions called with constant as parameter

Wed, 08 Jun 2011 11:42:19 +0100Allow use of ENO keyword in structured variable field selector.
Mario de Sousa <msousa@fe.up.pt> [Wed, 08 Jun 2011 11:42:19 +0100] rev 315
Allow use of ENO keyword in structured variable field selector.

Mon, 06 Jun 2011 16:28:41 +0200Fixing REAL_TO_INT conversion (behaved like a trunc and not like a round)
laurent [Mon, 06 Jun 2011 16:28:41 +0200] rev 314
Fixing REAL_TO_INT conversion (behaved like a trunc and not like a round)

Mon, 06 Jun 2011 14:05:28 +0100fixing INSERT function: was inserting into incorrect position. (submitted by Manuele)
Mario de Sousa <msousa@fe.up.pt> [Mon, 06 Jun 2011 14:05:28 +0100] rev 313
fixing INSERT function: was inserting into incorrect position. (submitted by Manuele)

Mon, 06 Jun 2011 11:01:47 +0200Fix bug when generating integer with leading zero (octal value for C compiler)
laurent [Mon, 06 Jun 2011 11:01:47 +0200] rev 312
Fix bug when generating integer with leading zero (octal value for C compiler)

Fri, 03 Jun 2011 17:14:24 +0100Allow [EOL] after a label in IL.
Mario de Sousa <msousa@fe.up.pt> [Fri, 03 Jun 2011 17:14:24 +0100] rev 311
Allow [EOL] after a label in IL.

Wed, 01 Jun 2011 14:02:16 +0200Fix bug when using an enumerated or subrange type to define a structure element
laurent [Wed, 01 Jun 2011 14:02:16 +0200] rev 310
Fix bug when using an enumerated or subrange type to define a structure element

Tue, 31 May 2011 15:35:05 +0200Fix bug when declaring data type directly derived from array type
laurent [Tue, 31 May 2011 15:35:05 +0200] rev 309
Fix bug when declaring data type directly derived from array type

Mon, 30 May 2011 19:28:32 +0100Fix conversion of binary digits to hex, when generating code.
Mario de Sousa <msousa@fe.up.pt> [Mon, 30 May 2011 19:28:32 +0100] rev 308
Fix conversion of binary digits to hex, when generating code.

Mon, 30 May 2011 19:24:09 +0100Fix missing '(' when declaring new simple derived data type.
Mario de Sousa <msousa@fe.up.pt> [Mon, 30 May 2011 19:24:09 +0100] rev 307
Fix missing '(' when declaring new simple derived data type.

Mon, 30 May 2011 19:16:22 +0100Ignore underscores in decimal integer constants when determining size in bits...
Mario de Sousa <msousa@fe.up.pt> [Mon, 30 May 2011 19:16:22 +0100] rev 306
Ignore underscores in decimal integer constants when determining size in bits...

Mon, 30 May 2011 17:54:15 +0100When checking semantics of expressions, skip semantic checking of data type definitions
Mario de Sousa <msousa@fe.up.pt> [Mon, 30 May 2011 17:54:15 +0100] rev 305
When checking semantics of expressions, skip semantic checking of data type definitions
(not yet supported). If we don't skip, all subsequent POUs would not be checked.

Mon, 30 May 2011 17:52:15 +0100Fixing algorithm that determines bit size of constants containing underscores.
Mario de Sousa <msousa@fe.up.pt> [Mon, 30 May 2011 17:52:15 +0100] rev 304
Fixing algorithm that determines bit size of constants containing underscores.

Fri, 27 May 2011 18:01:54 +0100Merging with Edouard's version
Mario de Sousa <msousa@fe.up.pt> [Fri, 27 May 2011 18:01:54 +0100] rev 303
Merging with Edouard's version

Fri, 27 May 2011 18:01:01 +0100Fixing bug related to setting array variables with values coming from other variables
Mario de Sousa <msousa@fe.up.pt> [Fri, 27 May 2011 18:01:01 +0100] rev 302
Fixing bug related to setting array variables with values coming from other variables
(e.g. X[0] := Y;)

Wed, 18 May 2011 16:32:46 +0200Added __IEC_OUTPUT_FLAG, to mark variable whose forcing implies refresh on eache cycle.
Edouard Tisserant [Wed, 18 May 2011 16:32:46 +0200] rev 301
Added __IEC_OUTPUT_FLAG, to mark variable whose forcing implies refresh on eache cycle.

Wed, 18 May 2011 13:20:24 +0200Fix bug when debugging located variables of type memory (%M) for all variable classes
laurent [Wed, 18 May 2011 13:20:24 +0200] rev 300
Fix bug when debugging located variables of type memory (%M) for all variable classes

Tue, 17 May 2011 10:35:12 +0100Merging with Edouard's changes
Mario de Sousa <msousa@fe.up.pt> [Tue, 17 May 2011 10:35:12 +0100] rev 299
Merging with Edouard's changes

Tue, 17 May 2011 10:34:00 +0100Fixing code generation of array indexes in Function Blocks.
Mario de Sousa <msousa@fe.up.pt> [Tue, 17 May 2011 10:34:00 +0100] rev 298
Fixing code generation of array indexes in Function Blocks.

Sun, 15 May 2011 10:22:15 +0100Commiting merge with Laurent's recent dead code removal change.
Mario de Sousa <msousa@fe.up.pt> [Sun, 15 May 2011 10:22:15 +0100] rev 297
Commiting merge with Laurent's recent dead code removal change.

Tue, 19 Apr 2011 09:36:59 +0100Adding fflush capabilities. It is sometimes usefull when debuging the compiler...
Mario de Sousa <msousa@fe.up.pt> [Tue, 19 Apr 2011 09:36:59 +0100] rev 296
Adding fflush capabilities. It is sometimes usefull when debuging the compiler...

Fri, 15 Apr 2011 09:45:27 +0100Adding missing semicolons.
Mario de Sousa <msousa@fe.up.pt> [Fri, 15 Apr 2011 09:45:27 +0100] rev 295
Adding missing semicolons.

Mon, 16 May 2011 14:19:20 +0200fixed build error with gcc 4.5.2
Edouard Tisserant [Mon, 16 May 2011 14:19:20 +0200] rev 294
fixed build error with gcc 4.5.2

Mon, 16 May 2011 12:36:21 +0200Merged with Edouard's modifications
laurent [Mon, 16 May 2011 12:36:21 +0200] rev 293
Merged with Edouard's modifications

Mon, 16 May 2011 11:57:41 +0200Fix bug when debugging located variables of type memory (%M)
laurent [Mon, 16 May 2011 11:57:41 +0200] rev 292
Fix bug when debugging located variables of type memory (%M)

Thu, 21 Apr 2011 11:22:13 +0200Removed dead code
Edouard Tisserant [Thu, 21 Apr 2011 11:22:13 +0200] rev 291
Removed dead code

Thu, 14 Apr 2011 19:17:20 +0100Fixing implementation of CU, CD, and CUD in standard library.
Mario de Sousa <msousa@fe.up.pt> [Thu, 14 Apr 2011 19:17:20 +0100] rev 290
Fixing implementation of CU, CD, and CUD in standard library.

Thu, 14 Apr 2011 19:02:35 +0100Deleting dead code.
Mario de Sousa <msousa@fe.up.pt> [Thu, 14 Apr 2011 19:02:35 +0100] rev 289
Deleting dead code.

Thu, 14 Apr 2011 18:55:31 +0100Merging changes.
Mario de Sousa <msousa@fe.up.pt> [Thu, 14 Apr 2011 18:55:31 +0100] rev 288
Merging changes.

Thu, 14 Apr 2011 18:12:59 +0100Added tracking of order by which tokens are processed by lexical analyser.
Mario de Sousa <msousa@fe.up.pt> [Thu, 14 Apr 2011 18:12:59 +0100] rev 287
Added tracking of order by which tokens are processed by lexical analyser.
This helps in correctly formating error messages when constructs begin in one file, and end in another.

Thu, 14 Apr 2011 17:35:25 +0100Adding tracking of filename in which token is located.
Mario de Sousa <msousa@fe.up.pt> [Thu, 14 Apr 2011 17:35:25 +0100] rev 286
Adding tracking of filename in which token is located.

Thu, 07 Apr 2011 11:40:03 +0200Reverted semantic error message so that Beremiz can parse them and that user can double-click on error message to open related POU and select the faulty line.
Edouard Tisserant [Thu, 07 Apr 2011 11:40:03 +0200] rev 285
Reverted semantic error message so that Beremiz can parse them and that user can double-click on error message to open related POU and select the faulty line.

Tue, 05 Apr 2011 19:42:33 +0100Fixing error message incorrectly changed in previous merge.
Mario de Sousa <msousa@fe.up.pt> [Tue, 05 Apr 2011 19:42:33 +0100] rev 284
Fixing error message incorrectly changed in previous merge.

Tue, 05 Apr 2011 18:31:55 +0100fixing C code generation of return_statement_c and exit_statement_c
Mario de Sousa <msousa@fe.up.pt> [Tue, 05 Apr 2011 18:31:55 +0100] rev 283
fixing C code generation of return_statement_c and exit_statement_c

Tue, 05 Apr 2011 17:12:12 +0100merging the Edouard's version.
Mario de Sousa <msousa@fe.up.pt> [Tue, 05 Apr 2011 17:12:12 +0100] rev 282
merging the Edouard's version.

Tue, 05 Apr 2011 14:24:07 +0100fixing exit_statement_c: produce 'break' instead of 'exit(0); (Thanks to Manuele)
Mario de Sousa <msousa@fe.up.pt> [Tue, 05 Apr 2011 14:24:07 +0100] rev 281
fixing exit_statement_c: produce 'break' instead of 'exit(0); (Thanks to Manuele)

Tue, 05 Apr 2011 14:17:16 +0100Fixing code generation of standard conversion functions.
Mario de Sousa <msousa@fe.up.pt> [Tue, 05 Apr 2011 14:17:16 +0100] rev 280
Fixing code generation of standard conversion functions.

Tue, 05 Apr 2011 15:14:19 +0200Re-generated std lib related code, with updated headers, updated all forgotten headers
Edouard Tisserant [Tue, 05 Apr 2011 15:14:19 +0200] rev 279
Re-generated std lib related code, with updated headers, updated all forgotten headers

Mon, 04 Apr 2011 19:18:22 +0200Merged matiec library headers update from Mario to LGPL
Edouard Tisserant [Mon, 04 Apr 2011 19:18:22 +0200] rev 278
Merged matiec library headers update from Mario to LGPL

Mon, 04 Apr 2011 15:59:35 +0100Changing to LGPL for library functions.
Mario de Sousa <msousa@fe.up.pt> [Mon, 04 Apr 2011 15:59:35 +0100] rev 277
Changing to LGPL for library functions.

Mon, 04 Apr 2011 15:26:13 +0100Updating origin and license info of library fuctions.
Mario de Sousa <msousa@fe.up.pt> [Mon, 04 Apr 2011 15:26:13 +0100] rev 276
Updating origin and license info of library fuctions.
Conclude missing counter FBs.

Mon, 04 Apr 2011 15:22:42 +0100Leave standard function names hardcoded, as these are considered keywords even though
Mario de Sousa <msousa@fe.up.pt> [Mon, 04 Apr 2011 15:22:42 +0100] rev 275
Leave standard function names hardcoded, as these are considered keywords even though
they may not be implemented in the library.

Mon, 04 Apr 2011 14:32:21 +0100New version of bistable.txt - due to license issues.
Mario de Sousa <msousa@fe.up.pt> [Mon, 04 Apr 2011 14:32:21 +0100] rev 274
New version of bistable.txt - due to license issues.

Mon, 04 Apr 2011 18:54:55 +0200Make semantic error message compatible with beremiz
Edouard Tisserant [Mon, 04 Apr 2011 18:54:55 +0200] rev 273
Make semantic error message compatible with beremiz

Mon, 04 Apr 2011 17:19:35 +0200Merge
Edouard Tisserant [Mon, 04 Apr 2011 17:19:35 +0200] rev 272
Merge

Mon, 04 Apr 2011 17:13:03 +0200Fixes to make handling of standard functions in Semantic analyser compatible with code generation of standard functions
Edouard Tisserant [Mon, 04 Apr 2011 17:13:03 +0200] rev 271
Fixes to make handling of standard functions in Semantic analyser compatible with code generation of standard functions

Mon, 04 Apr 2011 13:25:39 +0200Merge with changes from Mario
Edouard Tisserant [Mon, 04 Apr 2011 13:25:39 +0200] rev 270
Merge with changes from Mario

Mon, 04 Apr 2011 11:19:48 +0100Fixing stupid bug (that was disabling code generation).
Mario de Sousa <msousa@fe.up.pt> [Mon, 04 Apr 2011 11:19:48 +0100] rev 269
Fixing stupid bug (that was disabling code generation).

Mon, 04 Apr 2011 10:48:30 +0100Adding Makefile for Darwin (thanks go to Manuele)
Mario de Sousa <msousa@fe.up.pt> [Mon, 04 Apr 2011 10:48:30 +0100] rev 268
Adding Makefile for Darwin (thanks go to Manuele)

Mon, 04 Apr 2011 10:42:03 +0100starting to add proper header file with declaration of standard functions
Mario de Sousa <msousa@fe.up.pt> [Mon, 04 Apr 2011 10:42:03 +0100] rev 267
starting to add proper header file with declaration of standard functions

Fri, 01 Apr 2011 12:19:32 +0100Fixing error messages for IL semantic errors (brocken in a previous changeset/commit).
Mario de Sousa <msousa@fe.up.pt> [Fri, 01 Apr 2011 12:19:32 +0100] rev 266
Fixing error messages for IL semantic errors (brocken in a previous changeset/commit).

Fri, 01 Apr 2011 10:47:24 +0100Updating license info (with Edouard's permission for relevant files).
Mario de Sousa <msousa@fe.up.pt> [Fri, 01 Apr 2011 10:47:24 +0100] rev 265
Updating license info (with Edouard's permission for relevant files).

Fri, 01 Apr 2011 10:06:19 +0100Updating License info (with Edoaurd's permission for relevant files).
Mario de Sousa <msousa@fe.up.pt> [Fri, 01 Apr 2011 10:06:19 +0100] rev 264
Updating License info (with Edoaurd's permission for relevant files).

Fri, 01 Apr 2011 10:03:22 +0100Adding some debug info
Mario de Sousa <msousa@fe.up.pt> [Fri, 01 Apr 2011 10:03:22 +0100] rev 263
Adding some debug info

Thu, 31 Mar 2011 21:06:36 +0100Do not crash when checking semantics of undeclared symbolic_variable.
Mario de Sousa <msousa@fe.up.pt> [Thu, 31 Mar 2011 21:06:36 +0100] rev 262
Do not crash when checking semantics of undeclared symbolic_variable.
NOTE: this update may have broken the printing of error messages
during semantic analysis of IL code.

Thu, 31 Mar 2011 17:40:55 +0100Updating licensing information.
Mario de Sousa <msousa@fe.up.pt> [Thu, 31 Mar 2011 17:40:55 +0100] rev 261
Updating licensing information.

Thu, 31 Mar 2011 13:20:50 +0100Error messages (stage3) now better identify the location of the error.
Mario de Sousa <msousa@fe.up.pt> [Thu, 31 Mar 2011 13:20:50 +0100] rev 260
Error messages (stage3) now better identify the location of the error.

Thu, 31 Mar 2011 10:52:03 +0100Adding debug conditional printf()s in stage 3.
Mario de Sousa <msousa@fe.up.pt> [Thu, 31 Mar 2011 10:52:03 +0100] rev 259
Adding debug conditional printf()s in stage 3.
Printing semantic error info to stderr instead of stdout.

Thu, 31 Mar 2011 10:45:34 +0100Merging my Huge change with Edouards/Laurents version
Mario de Sousa <msousa@fe.up.pt> [Thu, 31 Mar 2011 10:45:34 +0100] rev 258
Merging my Huge change with Edouards/Laurents version

Wed, 30 Mar 2011 19:53:32 +0100Huge change.
Mario de Sousa <msousa@fe.up.pt> [Wed, 30 Mar 2011 19:53:32 +0100] rev 257
Huge change.

Fri, 01 Apr 2011 11:10:06 +0200Changed packing declaration in iec_types
Edouard Tisserant [Fri, 01 Apr 2011 11:10:06 +0200] rev 256
Changed packing declaration in iec_types

Fri, 01 Apr 2011 17:26:29 +0200Modify code generated for avoiding warning while compiling when configuration or resource don't have any global variable
laurent [Fri, 01 Apr 2011 17:26:29 +0200] rev 255
Modify code generated for avoiding warning while compiling when configuration or resource don't have any global variable

Thu, 31 Mar 2011 19:11:16 +0200Initial TIME support in debugger
Edouard Tisserant [Thu, 31 Mar 2011 19:11:16 +0200] rev 254
Initial TIME support in debugger

Sun, 27 Mar 2011 16:19:36 +0200Merged with Edouard's modifications
laurent [Sun, 27 Mar 2011 16:19:36 +0200] rev 253
Merged with Edouard's modifications

Sun, 27 Mar 2011 15:55:51 +0200Bug with getter for pointed variables in accessors fixed
laurent [Sun, 27 Mar 2011 15:55:51 +0200] rev 252
Bug with getter for pointed variables in accessors fixed

Sat, 26 Mar 2011 18:53:51 +0100Added dumb SEMA?implementation
Edouqrd Tisserant <edouard.tisserant@gmail.com> [Sat, 26 Mar 2011 18:53:51 +0100] rev 251
Added dumb SEMA?implementation

Wed, 16 Mar 2011 10:31:50 +0100Adding missing support for accessors and retain in configuration files (Bug and fix reported by Manuele Conti)
laurent [Wed, 16 Mar 2011 10:31:50 +0100] rev 250
Adding missing support for accessors and retain in configuration files (Bug and fix reported by Manuele Conti)

Sat, 12 Mar 2011 18:43:02 +0100Merged with modifications from Edouard
laurent [Sat, 12 Mar 2011 18:43:02 +0100] rev 249
Merged with modifications from Edouard

Sat, 12 Mar 2011 18:38:41 +0100Task single parameter code generation broken after addition of accessors fixed.
laurent [Sat, 12 Mar 2011 18:38:41 +0100] rev 248
Task single parameter code generation broken after addition of accessors fixed.

Sat, 12 Mar 2011 18:31:36 +0100Bug when function call result is a parameter of another function call fixed.
laurent [Sat, 12 Mar 2011 18:31:36 +0100] rev 247
Bug when function call result is a parameter of another function call fixed.

Tue, 22 Feb 2011 15:19:41 +0100A forgotten case in type size getter switch prevented debugging outputs.
edouard [Tue, 22 Feb 2011 15:19:41 +0100] rev 246
A forgotten case in type size getter switch prevented debugging outputs.

Wed, 16 Jun 2010 21:52:17 +0200merge
laurent [Wed, 16 Jun 2010 21:52:17 +0200] rev 245
merge

Wed, 02 Jun 2010 18:21:15 +0200Adding support for generating code for variable in step action association instead of action
laurent [Wed, 02 Jun 2010 18:21:15 +0200] rev 244
Adding support for generating code for variable in step action association instead of action

Thu, 03 Jun 2010 12:59:32 +0200Updated makefiles for cygwin build with no perl
Lolitech [Thu, 03 Jun 2010 12:59:32 +0200] rev 243
Updated makefiles for cygwin build with no perl

Thu, 20 May 2010 23:36:53 +0200Bug with global located variables accessors fixed
laurent [Thu, 20 May 2010 23:36:53 +0200] rev 242
Bug with global located variables accessors fixed

Wed, 19 May 2010 21:51:52 +0200Bug with code generation of global located variables in resource fixed thanks to Mario
laurent [Wed, 19 May 2010 21:51:52 +0200] rev 241
Bug with code generation of global located variables in resource fixed thanks to Mario

Thu, 22 Apr 2010 07:03:18 +0200Bugs fixed:
laurent [Thu, 22 Apr 2010 07:03:18 +0200] rev 240
Bugs fixed:
- S and R operators using C++ literals
- Function block output assignment code generation

Thu, 22 Apr 2010 00:29:30 +0200Bug when parsing standard function block call in IL
laurent [Thu, 22 Apr 2010 00:29:30 +0200] rev 239
Bug when parsing standard function block call in IL

Tue, 15 Dec 2009 20:50:30 +0100Bug when trying to get type of elements in a big complex structure fixed
laurent [Tue, 15 Dec 2009 20:50:30 +0100] rev 238
Bug when trying to get type of elements in a big complex structure fixed

Tue, 15 Dec 2009 16:29:44 +0100Adding support for using arrays in POU interface
laurent [Tue, 15 Dec 2009 16:29:44 +0100] rev 237
Adding support for using arrays in POU interface

Tue, 15 Dec 2009 11:18:19 +0100Using InOut variables in functions fixed
laurent [Tue, 15 Dec 2009 11:18:19 +0100] rev 236
Using InOut variables in functions fixed

Tue, 15 Dec 2009 08:51:44 +0100Bug on generate_c_inlinefcall fixed
laurent [Tue, 15 Dec 2009 08:51:44 +0100] rev 235
Bug on generate_c_inlinefcall fixed
Adding support for using structures in POU interface

Sun, 13 Dec 2009 11:41:22 +0100Using function_call_iterator in generate_c_inlinefcall instead of creating a new visitor
laurent [Sun, 13 Dec 2009 11:41:22 +0100] rev 234
Using function_call_iterator in generate_c_inlinefcall instead of creating a new visitor

Sat, 12 Dec 2009 20:41:32 +0100Bug on standard functions called with literals fixed
laurent [Sat, 12 Dec 2009 20:41:32 +0100] rev 233
Bug on standard functions called with literals fixed
Checking that number of parameters in function call doesn't exceed the maximum

Fri, 11 Dec 2009 13:01:17 +0100Adding support for making distinction between external variables and located variables for forcing
laurent [Fri, 11 Dec 2009 13:01:17 +0100] rev 232
Adding support for making distinction between external variables and located variables for forcing

Fri, 11 Dec 2009 12:53:54 +0100Adding support for forcing global without perturbation from setting external
laurent [Fri, 11 Dec 2009 12:53:54 +0100] rev 231
Adding support for forcing global without perturbation from setting external

Wed, 09 Dec 2009 16:45:27 +0100Bug in located variable initialization code fixed
laurent [Wed, 09 Dec 2009 16:45:27 +0100] rev 230
Bug in located variable initialization code fixed

Tue, 08 Dec 2009 16:26:06 +0100Bug on SFC debugging fixed
laurent [Tue, 08 Dec 2009 16:26:06 +0100] rev 229
Bug on SFC debugging fixed
Adding support for forcing transition state

Mon, 07 Dec 2009 15:36:29 +0100Adding support for setter and getter on complex datatype in IL
berem [Mon, 07 Dec 2009 15:36:29 +0100] rev 228
Adding support for setter and getter on complex datatype in IL

Sat, 05 Dec 2009 18:53:01 +0100Changes merged
laurent [Sat, 05 Dec 2009 18:53:01 +0100] rev 227
Changes merged