Merge branch 'lamp'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 1 Feb 2012 17:18:16 +0000 (18:18 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 1 Feb 2012 17:18:16 +0000 (18:18 +0100)
commitf949b0975ec334f3c2b850dd1c0b8045e283ee46
treeae8d7a5e3def005ab59f8274054077ab67a70e0e
parent0b18cfc4fcf7132080d8f3891512f72727318700
parent7e8b20a5ae900d0f518d58da1acf68515923fe4b
Merge branch 'lamp'