merge bugfix
authorHannes Gredler <hannes@gredler.at>
Wed, 20 Aug 2008 14:26:00 +0000 (16:26 +0200)
committerHannes Gredler <hannes@gredler.at>
Wed, 20 Aug 2008 14:26:00 +0000 (16:26 +0200)
commita4127b756df6a9146220c6acd1ec0f7526e1477a
treedb12ec3e6c81bfb5cd724d2db61fd7b3c89cb5d7
parent375646411d96128cafda6ae5be43a26dedbc15c3
parente44e428519693ebeee74fbdb739ec3ce8cc6841e
merge bugfix