changeset: 3600:c69b9b04a3d4 branch: cakernel parent: 3537:0419ed8b26da parent: 3599:4e81d4832958 user: Ian Hinder ian.hinder@aei.mpg.de date: Mon Jul 23 15:08:30 2012 +0200 summary: Merge master into cakernel

changeset: 3601:d87f6f243243 branch: cakernel tag: tip user: Marek Blazewicz marqs@man.poznan.pl date: Mon Jul 23 18:10:19 2012 +0200 summary: Added parameter to lost somewhere during Ian's merge of branches