Merged changes from master
commit658795b9ca934fc591353b6e81b3d8f7296a9cb5
authorBastian Eicher <bastian@eicher.net>
Tue, 8 Mar 2011 22:17:14 +0000 (8 23:17 +0100)
committerBastian Eicher <bastian@eicher.net>
Tue, 8 Mar 2011 22:17:14 +0000 (8 23:17 +0100)
treeb57182ffed13de6dcc1a0c69e20aa99c16181416
parentc021ae8b6c43dcd39603933cac73f68be8634a48
parent65e9c022d6f37a75d6fe9ea0dce9655476008276
Merged changes from master