Merge commit 'local_master/bootmanager-vender' into myplc-0_4-branch myplc-0_4-branch
authorroot <root@blitz.inria.fr>
Fri, 16 Jul 2010 04:32:09 +0000 (06:32 +0200)
committerroot <root@blitz.inria.fr>
Fri, 16 Jul 2010 04:32:09 +0000 (06:32 +0200)
commitbecb02bfb33dd14e133b8216159e03e09557eb65
tree6865021c7044e870166d26ccacbedeb8cdd5e658
parent688d3a471e2e0a6f63fcf4d3515f7e96c65c04ef
parent0ead051299a3094173442795ee262b0900a71ecd
Merge commit 'local_master/bootmanager-vender' into myplc-0_4-branch