Merge branch 't/patch491'
commit5f77fd6a81a4241ce5a8e346acb9df089d65b462
authorCarsten Dominik <carsten.dominik@gmail.com>
Mon, 20 Dec 2010 14:50:23 +0000 (20 15:50 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Mon, 20 Dec 2010 14:50:23 +0000 (20 15:50 +0100)
tree502517de8043f3bf142af0b47aa88cf64d0c2fd7
parentf9e174b74ed197cd61781936b08fb926140c393c
parent2be22d9aa4829432d3c3e511d664f3fc2f454354
Merge branch 't/patch491'