Andreas Huber e21fb34387 am 5493df91: am bbd6cb46: Merge change Ib1b7bce4 into eclair-mr2
Merge commit '5493df919b01952857eb3b78fad3fe2cff573935'

* commit '5493df919b01952857eb3b78fad3fe2cff573935':
  Squashed commit of the following:
2009-11-23 10:55:40 -08:00
..
2009-05-31 19:13:00 -07:00
2009-11-18 18:45:59 -05:00