merge
authorfp <fp@fp-laptop>
Fri, 15 Oct 2010 22:04:36 +0000 (00:04 +0200)
committerfp <fp@fp-laptop>
Fri, 15 Oct 2010 22:04:36 +0000 (00:04 +0200)
commitbdad496c29e9355dd36dbd732488e27970d25d03
tree5313fc522c37a4f370e4014b8f2feb299ec78397
parentbf9d455d684c15882d87b1069e2d5f78aee61853
parent12e5a78d6ecc369a181e7950fca2991a36db8d07
merge

bzr revid: fp@fp-laptop-20101015220436-9enmn7j1b1azbbyp