Merge branch 'bl/halo'
commit43b2cea6a1882d439b2ec7697b97b79098045842
authorDiego Hernan Borghetti <bdiego@gmail.com>
Mon, 21 Apr 2008 14:25:34 +0000 (21 11:25 -0300)
committerDiego Hernan Borghetti <bdiego@gmail.com>
Mon, 21 Apr 2008 14:25:34 +0000 (21 11:25 -0300)
tree82d01ae6ddb6578f3fa22eee8c45a585786ccdc4
parentcd10e67060c6ca05b9dbf5e73c3ba3c395902e86
parent4ef191ae9c937c374c374f0ad9a167f9f81e6b12
Merge branch 'bl/halo'