[MERGE] merged with trunk
authorjavieredm@vauxoo.com <>
Mon, 10 Oct 2011 17:07:27 +0000 (13:07 -0400)
committerjavier <javier@cl-t076-283cl>
Mon, 10 Oct 2011 17:07:27 +0000 (13:07 -0400)
commit9ad2984a07928740807cf58aa8a1ffbf318be64e
tree229e258a66079a1f8146afe23c562419edd0e9ea
parentdbc307b540957392f827bcdfb8847fbe4493558a
parent5ca1ee4fff8a0b24a6d5835d5016e924b7932be1
[MERGE] merged with trunk

bzr revid: javier@cl-t076-283cl-20111010170727-r7rh4th9e42x08mp