Merge branch 'fixes'
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Thu, 22 Jan 2009 10:11:09 +0000 (11:11 +0100)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Thu, 22 Jan 2009 10:11:09 +0000 (11:11 +0100)
commit4d0b54685c5c656023b826089ef8cc0ea1c5cd9e
treedfc822a632f14cdb830784e00c7a253bbb69a75a
parent72d15e705bc3983884105cb7755c7ba80e74a0a5
parent92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb
Merge branch 'fixes'