Jean-Baptiste Queru f7a6ead075 Manual merge ... Change-Id: Ie74c9c4931d3a1ec34bbdf4307d98c8e66c9ddd5		2010-08-25 10:01:35 -07:00
..
board	Manual merge	2010-08-25 10:01:35 -07:00
product	Replaced AlarmClock with DeskClock	2010-07-23 20:09:54 +02:00