Alpar Juttner <alpar@cs.elte.hu> [Mon, 25 Oct 2010 15:33:57 +0200] rev 911
SOURCE_BROWSER Doxygen switch is configurable from CMAKE (#395)
Alpar Juttner <alpar@cs.elte.hu> [Mon, 25 Oct 2010 13:37:06 +0200] rev 910
Full path for DoxygenLayout.xml in Doxyfile.in (#395)
Alpar Juttner <alpar@cs.elte.hu> [Wed, 27 Oct 2010 12:30:59 +0200] rev 909
The deafult target doesn't build lp_test and mip_test (#388)
Alpar Juttner <alpar@cs.elte.hu> [Sun, 26 Sep 2010 16:17:33 +0200] rev 908
Create and install lemon.pc (#393)
Alpar Juttner <alpar@cs.elte.hu> [Wed, 22 Sep 2010 09:38:23 +0200] rev 907
Merge bugfix #392
Alpar Juttner <alpar@cs.elte.hu> [Wed, 22 Sep 2010 08:53:09 +0200] rev 906
Bug fix in Dfs::start(s,t) (#392)
Alpar Juttner <alpar@cs.elte.hu> [Sun, 12 Sep 2010 08:32:46 +0200] rev 905
Merge #380
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 23 Jul 2010 06:29:37 +0200] rev 904
Add a heuristic algorithm for the max clique problem (#380)
Alpar Juttner <alpar@cs.elte.hu> [Sun, 12 Sep 2010 07:02:51 +0200] rev 903
Merge CMAKE config improvements (#388, #389, #390)
Alpar Juttner <alpar@cs.elte.hu> [Sat, 11 Sep 2010 09:31:06 +0200] rev 902
Allow CPACK configuration on all platforms
Alpar Juttner <alpar@cs.elte.hu> [Fri, 10 Sep 2010 12:04:38 +0200] rev 901
Add 'Maintainer' CMAKE build type (#388, #390)
- some extra warning and debug options
- build stops on warning (-Werror)
- tests are built and run by default
Alpar Juttner <alpar@cs.elte.hu> [Thu, 09 Sep 2010 15:55:00 +0200] rev 900
Make CMAKE config more consistent with configure.ac (#390)
- CMAKE_BUILD_TYPE is Release by deafult
- The same set of warnings are used when compiling with gcc
Alpar Juttner <alpar@cs.elte.hu> [Fri, 03 Sep 2010 15:37:19 +0200] rev 899
Safer call of ./scripts/chg-len.py on Windows (#389)
Still hard to get it worked properly by user. It needs
- a python interpreter in the exec path
- the mercurial modules accessible by this interpreter
Akos Ladanyi <ladanyi@tmit.bme.hu> [Wed, 25 Aug 2010 22:02:40 +0200] rev 898
Put the output of chg-len.py in the version string (#389)
Akos Ladanyi <ladanyi@tmit.bme.hu> [Wed, 25 Aug 2010 21:34:58 +0200] rev 897
Add check target for CMake (#388)
Peter Kovacs <kpeter@inf.elte.hu> [Sat, 04 Sep 2010 23:58:03 +0200] rev 896
Improve arc mixing in NS and enable it by default (#391)
Peter Kovacs <kpeter@inf.elte.hu> [Sun, 22 Aug 2010 23:54:10 +0200] rev 895
Improve the tree update process and a pivot rule (#391)
and make some parts of the code clearer using better names
Peter Kovacs <kpeter@inf.elte.hu> [Tue, 22 Jun 2010 16:13:00 +0200] rev 894
Improve graph_copy_test.cc
Alpar Juttner <alpar@cs.elte.hu> [Fri, 25 Jun 2010 06:41:55 +0200] rev 893
Merge bugfix #371
Alpar Juttner <alpar@cs.elte.hu> [Fri, 25 Jun 2010 06:00:56 +0200] rev 892
Merge bugfix #372
Balazs Dezso <deba@inf.elte.hu> [Thu, 24 Jun 2010 09:27:53 +0200] rev 891
Fix critical bug in preflow (#372)
The wrong transition between the bound decrease and highest active
heuristics caused the bug. The last node chosen in bound decrease mode
is used in the first iteration in highest active mode.
Peter Kovacs <kpeter@inf.elte.hu> [Tue, 22 Jun 2010 15:39:26 +0200] rev 890
Bug fix in (di)graphCopy() (#371)
The target graph is cleared before adding nodes and arcs/edges.
Alpar Juttner <alpar@cs.elte.hu> [Mon, 03 May 2010 10:56:24 +0200] rev 889
Merge bugfix #368
Peter Kovacs <kpeter@inf.elte.hu> [Sun, 02 May 2010 18:53:56 +0200] rev 888
Fix the usage of min() (#368)
Alpar Juttner <alpar@cs.elte.hu> [Mon, 12 Apr 2010 17:05:49 +0200] rev 887
Merge bugfix #366
Balazs Dezso <deba@inf.elte.hu> [Mon, 12 Apr 2010 13:59:41 +0200] rev 886
Fix PredMatrixMapPath::empty() (#366)
Gabor Retvari <retvari@tmit.bme.hu> [Sun, 11 Apr 2010 22:28:42 +0200] rev 885
Fix PredMapPath::empty() (#366)
Alpar Juttner <alpar@cs.elte.hu> [Tue, 06 Apr 2010 07:04:38 +0200] rev 884
Merge bugfix #364
Peter Kovacs <kpeter@inf.elte.hu> [Mon, 05 Apr 2010 23:41:05 +0200] rev 883
Add an undirected() function (#364)
Peter Kovacs <kpeter@inf.elte.hu> [Mon, 05 Apr 2010 23:33:57 +0200] rev 882
Add missing UndirectedTags (#364)
Alpar Juttner <alpar@cs.elte.hu> [Wed, 17 Mar 2010 14:05:23 +0100] rev 881
Update NEWS file
Alpar Juttner <alpar@cs.elte.hu> [Thu, 18 Mar 2010 14:17:03 +0100] rev 880
Merge backout of a6eb9698c321 (#360,#51)
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 18 Mar 2010 00:30:25 +0100] rev 879
Small doc fixes and improvements (#359)
Alpar Juttner <alpar@cs.elte.hu> [Thu, 18 Mar 2010 13:18:58 +0100] rev 878
Backed out changeset a6eb9698c321 (#360, #51)
Alpar Juttner <alpar@cs.elte.hu> [Sat, 06 Mar 2010 14:35:12 +0000] rev 877
Unify the sources (#339)
Balazs Dezso <deba@inf.elte.hu> [Wed, 17 Mar 2010 12:35:52 +0100] rev 876
Fix multiple executions in matchings (fract. mathcings) (#356)
Alpar Juttner <alpar@cs.elte.hu> [Wed, 17 Mar 2010 10:29:57 +0100] rev 875
Merge #356
Alpar Juttner <alpar@cs.elte.hu> [Tue, 16 Mar 2010 21:27:35 +0100] rev 874
Merge #314
Alpar Juttner <alpar@cs.elte.hu> [Tue, 16 Mar 2010 21:18:39 +0100] rev 873
Minor doc fix related to #348
Balazs Dezso <deba@inf.elte.hu> [Thu, 04 Mar 2010 15:20:59 +0100] rev 872
Uniforming primal scale to 2 (#314)
Balazs Dezso <deba@inf.elte.hu> [Thu, 04 Mar 2010 10:17:02 +0100] rev 871
Fix documentation issues (#314)
Balazs Dezso <deba@inf.elte.hu> [Sat, 26 Sep 2009 10:17:31 +0200] rev 870
Fractional matching initialization of weighted matchings (#314)
Balazs Dezso <deba@inf.elte.hu> [Fri, 25 Sep 2009 21:51:36 +0200] rev 869
Add fractional matching algorithms (#314)
Balazs Dezso <deba@inf.elte.hu> [Sun, 20 Sep 2009 21:38:24 +0200] rev 868
General improvements in weighted matching algorithms (#314)
- Fix include guard
- Uniform handling of MATCHED and UNMATCHED blossoms
- Prefer operations which decrease the number of trees
- Fix improper use of '/='
The solved problems did not cause wrong solution.
Balazs Dezso <deba@inf.elte.hu> [Tue, 16 Mar 2010 21:12:10 +0100] rev 867
Fix multiple execution bug in weighted matchings (#356)
This chgset also redoes the fix of [28c7ad6f8d91] and its backpont to 1.1,
[268a052c3043].
Alpar Juttner <alpar@cs.elte.hu> [Sun, 14 Mar 2010 09:14:05 +0100] rev 866
Add doc/references.dox to .hgignore
Alpar Juttner <alpar@cs.elte.hu> [Sun, 14 Mar 2010 09:13:04 +0100] rev 865
Replace figure at matching doc #348
The original bibartite_matching.eps is kept for future use.
Peter Kovacs <kpeter@inf.elte.hu> [Sat, 13 Mar 2010 22:01:38 +0100] rev 864
Rename min mean cycle classes and their members (#179)
with respect to the possible introduction of min ratio
cycle algorithms in the future.
The renamed classes:
- Karp --> KarpMmc
- HartmannOrlin --> HartmannOrlinMmc
- Howard --> HowardMmc
The renamed members:
- cycleLength() --> cycleCost()
- cycleArcNum() --> cycleSize()
- findMinMean() --> findCycleMean()
- Value --> Cost
- LargeValue --> LargeCost
- SetLargeValue --> SetLargeCost
Peter Kovacs <kpeter@inf.elte.hu> [Mon, 08 Mar 2010 08:33:41 +0100] rev 863
Fix gcc 3.3 compilation error (#354)
gcc 3.3 requires that a class has a default constructor if it has
template named parameters. (That constructor can be protected.)
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 04 Mar 2010 10:03:14 +0100] rev 862
Clarify type names in NetworkSimplex (#353)
This patch clarifies the misleading effects of the renamings
in [f3bc4e9b5f3a].
Alpar Juttner <alpar@cs.elte.hu> [Wed, 03 Mar 2010 20:48:29 +0000] rev 861
Merge #306
Peter Kovacs <kpeter@inf.elte.hu> [Tue, 02 Mar 2010 10:03:07 +0100] rev 860
Add tolerance() functions for HaoOrlin (#306)
Alpar Juttner <alpar@cs.elte.hu> [Wed, 03 Mar 2010 17:22:13 +0000] rev 859
Merge #301
Peter Kovacs <kpeter@inf.elte.hu> [Tue, 02 Mar 2010 10:27:47 +0100] rev 858
Also test fullInit() in suurballe_test (#181, #323)
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 16 Oct 2009 09:35:46 +0200] rev 857
Add traits class + named parameters to Suurballe (#323)
The following types can be modified using named parameters:
- FlowMap
- PotentialMap
- Path
- Heap + HeapCrossRef
Alpar Juttner <alpar@cs.elte.hu> [Wed, 03 Mar 2010 17:14:17 +0000] rev 856
Merge #181, #323
Peter Kovacs <kpeter@inf.elte.hu> [Tue, 29 Sep 2009 13:32:01 +0200] rev 855
Rename heap structures (#301)
- KaryHeap --> DHeap
- FouraryHeap --> QuadHeap
- BinomHeap --> BinomialHeap
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 16 Oct 2009 02:32:30 +0200] rev 854
Add a fullInit() function to Suurballe (#181, #323)
to provide faster handling of multiple targets.
A start() function is also added, just for the sake of
convenience.
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 16 Oct 2009 01:06:16 +0200] rev 853
Rework and improve Suurballe (#323)
- Improve the implementation: use a specific, faster variant of
residual Dijkstra for the first search.
- Some reorganizatiopn to make the code simpler.
- Small doc improvements.
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 15 Oct 2009 21:04:50 +0200] rev 852
Remove unnecessary integer requirement in Suurballe (#323)
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 15 Oct 2009 21:03:17 +0200] rev 851
Bug fix in Suurballe (#323)
Alpar Juttner <alpar@cs.elte.hu> [Mon, 01 Mar 2010 07:51:45 +0100] rev 850
Configurable glpk prefix in ./scripts/bootstrap.sh and ...
unneeded solver backends are explicitely switched off with --without-*
Alpar Juttner <alpar@cs.elte.hu> [Sun, 28 Feb 2010 20:52:08 +0100] rev 849
Merge #342
Peter Kovacs <kpeter@inf.elte.hu> [Sun, 14 Feb 2010 19:06:07 +0100] rev 848
Improve README and mainpage.dox (#342)
Alpar Juttner <alpar@cs.elte.hu> [Sun, 28 Feb 2010 19:58:24 +0100] rev 847
Merge #347
Peter Kovacs <kpeter@inf.elte.hu> [Sat, 20 Feb 2010 16:51:43 +0100] rev 846
Use 'long long' flow cost in dimacs-solver.cc (#347)
Alpar Juttner <alpar@cs.elte.hu> [Sun, 28 Feb 2010 19:38:29 +0100] rev 845
Merge
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 19 Feb 2010 14:08:32 +0100] rev 844
Support tolerance technique for BellmanFord (#51)
A new operation traits class BellmanFordToleranceOperationTraits
is introduced, which uses the tolerance technique in its less()
function. This class can be used with the SetOperationTraits
named template parameter.
Alpar Juttner <alpar@cs.elte.hu> [Sun, 28 Feb 2010 19:23:01 +0100] rev 843
Merge #332
Alpar Juttner <alpar@cs.elte.hu> [Sun, 14 Feb 2010 19:23:55 +0100] rev 842
ArgParser can throw exception instead of exit(1) (#332)
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 26 Feb 2010 23:53:09 +0100] rev 841
Better return type for cycleLength() functions (#179)
in the min mean cycle algorithms.
The original Value type is used instead of the LargeValue type,
which is introduced for internal computations.
Alpar Juttner <alpar@cs.elte.hu> [Fri, 26 Feb 2010 14:00:20 +0100] rev 840
Merge #340
Peter Kovacs <kpeter@inf.elte.hu> [Sat, 20 Feb 2010 18:39:03 +0100] rev 839
New heuristics for MCF algorithms (#340)
and some implementation improvements.
- A useful heuristic is added to NetworkSimplex to make the
initial pivots faster.
- A powerful global update heuristic is added to CostScaling
and the implementation is reworked with various improvements.
- Better relabeling in CostScaling to improve numerical stability
and make the code faster.
- A small improvement is made in CapacityScaling for better
delta computation.
- Add notes to the classes about the usage of vector<char> instead
of vector<bool> for efficiency reasons.
Alpar Juttner <alpar@cs.elte.hu> [Sun, 21 Feb 2010 18:55:30 +0100] rev 838
Merge bugfix #336
Alpar Juttner <alpar@cs.elte.hu> [Thu, 11 Feb 2010 10:02:11 +0100] rev 837
Fix the date field comment of graphToEps() output (#336)
Peter Kovacs <kpeter@inf.elte.hu> [Wed, 17 Feb 2010 23:10:36 +0100] rev 836
Modify the header of scripts/bib2dox.py (#184)
Alpar Juttner <alpar@cs.elte.hu> [Mon, 15 Feb 2010 09:03:11 +0100] rev 835
Merge
Balazs Dezso <deba@inf.elte.hu> [Thu, 10 Dec 2009 09:09:08 +0100] rev 834
Fix LpBase::addRow(Constr) (#334)
Balazs Dezso <deba@inf.elte.hu> [Sun, 14 Feb 2010 23:14:09 +0100] rev 833
Merge bugfix #337
Balazs Dezso <deba@inf.elte.hu> [Sun, 14 Feb 2010 23:10:24 +0100] rev 832
Use void* like LPX object (#337)
Alpar Juttner <alpar@cs.elte.hu> [Fri, 12 Feb 2010 22:24:26 +0100] rev 831
Merge
Peter Kovacs <kpeter@inf.elte.hu> [Wed, 10 Feb 2010 19:05:20 +0100] rev 830
Handle graph changes in the MCF algorithms (#327)
The reset() functions are renamed to resetParams() and the new reset()
functions handle the graph chnages, as well.
Alpar Juttner <alpar@cs.elte.hu> [Fri, 12 Feb 2010 22:17:20 +0100] rev 829
Merge
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 11 Feb 2010 07:40:29 +0100] rev 828
Doc improvements for planarity related tools (#62)
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 11 Feb 2010 07:39:57 +0100] rev 827
Port planar image from SVN -r3524 (#62)
Alpar Juttner <alpar@cs.elte.hu> [Fri, 12 Feb 2010 21:53:15 +0100] rev 826
Merge
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 12 Feb 2010 11:00:20 +0100] rev 825
Add doc for the traits class parameters (#315)
Akos Ladanyi <ladanyi@tmit.bme.hu> [Thu, 11 Feb 2010 16:55:54 +0000] rev 824
Add more information on Makefile variables (#316)
Peter Kovacs <kpeter@inf.elte.hu> [Tue, 09 Feb 2010 23:29:51 +0100] rev 823
Add a warning about huge capacities in Preflow (#319)
Alpar Juttner <alpar@cs.elte.hu> [Mon, 14 Dec 2009 06:07:52 +0100] rev 822
Merge #180 and a bugfix in #51
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 13 Nov 2009 00:39:28 +0100] rev 821
Small bug fixes (#180)
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 13 Nov 2009 00:37:55 +0100] rev 820
Rename a private type in MCF classes (#180)
The new MCF algorithms define a private map type VectorMap,
which could be misleading, since there is an other VectorMap
defined in lemon/bits/vector_map.h. Thus the new type is
is renamed to StaticVectorMap.
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 13 Nov 2009 00:24:39 +0100] rev 819
Adds tests for the new MCF algorithms (#180)
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 13 Nov 2009 00:23:07 +0100] rev 818
Rework the MCF test file to help extending it (#180)
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 13 Nov 2009 00:15:50 +0100] rev 817
Fixes in the heap concept to avoid warnings (#180)
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 13 Nov 2009 00:11:11 +0100] rev 816
Add citations to CycleCanceling (#180, #184)
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 13 Nov 2009 00:10:33 +0100] rev 815
Entirely rework cycle canceling algorithms (#180)
- Move the cycle canceling algorithms (CycleCanceling, CancelAndTighten)
into one class (CycleCanceling).
- Add a Method parameter to the run() function to be able to select
the used cycle canceling method.
- Use the new interface similarly to NetworkSimplex.
- Rework the implementations using an efficient internal structure
for handling the residual network.
This improvement made the codes much faster.
- Handle GEQ supply type (LEQ is not supported).
- Handle infinite upper bounds.
- Handle negative costs (for arcs of finite upper bound).
- Extend the documentation.
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 13 Nov 2009 00:09:35 +0100] rev 814
Port cycle canceling algorithms from SVN -r3524 (#180)
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 12 Nov 2009 23:52:51 +0100] rev 813
Add citations to the scaling MCF algorithms (#180, #184)
and improve the doc of their group.
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 12 Nov 2009 23:49:05 +0100] rev 812
Small doc improvements + unifications in MCF classes (#180)
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 12 Nov 2009 23:45:15 +0100] rev 811
Small implementation improvements in MCF algorithms (#180)
- Handle max() as infinite value (not only infinity()).
- Better GEQ handling in CapacityScaling.
- Skip the unnecessary saturating operations in the first phase in
CapacityScaling.
- Use vector<char> instead of vector<bool> and vector<int> if it is
possible and it proved to be usually faster.
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 12 Nov 2009 23:34:35 +0100] rev 810
More options for run() in scaling MCF algorithms (#180)
- Three methods can be selected and the scaling factor can be
given for CostScaling.
- The scaling factor can be given for CapacityScaling.
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 12 Nov 2009 23:30:45 +0100] rev 809
Entirely rework CostScaling (#180)
- Use the new interface similarly to NetworkSimplex.
- Rework the implementation using an efficient internal structure
for handling the residual network. This improvement made the
code much faster.
- Handle GEQ supply type (LEQ is not supported).
- Handle infinite upper bounds.
- Handle negative costs (for arcs of finite upper bound).
- Traits class + named parameter for the LargeCost type used in
internal computations.
- Extend the documentation.
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 12 Nov 2009 23:29:42 +0100] rev 808
Port CostScaling from SVN -r3524 (#180)
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 12 Nov 2009 23:27:21 +0100] rev 807
Traits class + a named parameter for CapacityScaling (#180)
to specify the heap used in internal Dijkstra computations.
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 12 Nov 2009 23:26:13 +0100] rev 806
Entirely rework CapacityScaling (#180)
- Use the new interface similarly to NetworkSimplex.
- Rework the implementation using an efficient internal structure
for handling the residual network. This improvement made the
code much faster (up to 2-5 times faster on large graphs).
- Handle GEQ supply type (LEQ is not supported).
- Handle negative costs for arcs of finite capacity.
(Note that this algorithm cannot handle arcs of negative cost
and infinite upper bound, thus it returns UNBOUNDED if such
an arc exists.)
- Extend the documentation.
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 12 Nov 2009 23:17:34 +0100] rev 805
Port CapacityScaling from SVN -r3524 (#180)
Peter Kovacs <kpeter@inf.elte.hu> [Sun, 13 Dec 2009 22:19:08 +0100] rev 804
Memory leak bugfix in BellmanFord (#51)
Alpar Juttner <alpar@cs.elte.hu> [Thu, 10 Dec 2009 17:18:25 +0100] rev 803
Merge bugfix #330
Alpar Juttner <alpar@cs.elte.hu> [Thu, 10 Dec 2009 17:05:35 +0100] rev 802
Merge
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 13 Nov 2009 12:33:33 +0100] rev 801
Bug fix in map_extender.h (#330)
Balazs Dezso <deba@inf.elte.hu> [Thu, 10 Dec 2009 09:14:47 +0100] rev 800
Fix clear() function in ExtendFindEnum (#335)
Alpar Juttner <alpar@cs.elte.hu> [Wed, 09 Dec 2009 11:14:06 +0100] rev 799
Merge #62
Balazs Dezso <deba@inf.elte.hu> [Sun, 04 Oct 2009 10:15:32 +0200] rev 798
Planarity checking function instead of class (#62)
Balazs Dezso <deba@inf.elte.hu> [Wed, 09 Sep 2009 15:32:03 +0200] rev 797
Port planarity related algorithms from SVN 3509 (#62)
Alpar Juttner <alpar@cs.elte.hu> [Fri, 20 Nov 2009 14:18:33 +0100] rev 796
Merge
Balazs Dezso <deba@inf.elte.hu> [Wed, 18 Nov 2009 21:21:26 +0100] rev 795
Fix in HartmannOrlin algorithm (#333)
Alpar Juttner <alpar@cs.elte.hu> [Thu, 19 Nov 2009 09:36:43 +0100] rev 794
Valgring option for ./scripts/bootstrap.sh
Akos Ladanyi <ladanyi@tmit.bme.hu> [Wed, 18 Nov 2009 18:37:21 +0000] rev 793
Optionally use valgrind when running tests + other build system fixes
Alpar Juttner <alpar@cs.elte.hu> [Wed, 18 Nov 2009 14:38:38 +0100] rev 792
Merge