Andreas Huber 4f471648e9 am b5c6be6d: am 082e5171: Merge change I895fb7d7 into eclair-mr2
Merge commit 'b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb'

* commit 'b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb':
  Squashed commit of the following:
2009-12-17 10:27:48 -08:00
..
2009-12-16 16:05:08 -08:00
2009-11-18 18:45:59 -05:00