Merge branch 'bl/lamp'
commita6c4812803d134b858fac05b82ed1acf79886a0d
authorDiego Hernan Borghetti <bdiego@gmail.com>
Fri, 14 Mar 2008 13:28:47 +0000 (14 10:28 -0300)
committerDiego Hernan Borghetti <bdiego@gmail.com>
Fri, 14 Mar 2008 13:28:47 +0000 (14 10:28 -0300)
tree8f1aa3517f996ba58d86605508141537cb3734bd
parentf669187a1b8a29415a1d73c60cdc62e04f7e8ec0
parent2d017be1e6f89a091caa546b4ae80bc47b43ba7c
Merge branch 'bl/lamp'