Merge branch 'local'
authoroberger <oberger@7e9734f2-5825-4a1b-abe6-0096d909c21f>
Wed, 15 Dec 2010 11:03:56 +0000 (11:03 +0000)
committeroberger <oberger@7e9734f2-5825-4a1b-abe6-0096d909c21f>
Wed, 15 Dec 2010 11:03:56 +0000 (11:03 +0000)
commitd657bbdc5ab73d8910c16fa4aaa89aa140cfb001
tree584eed6cbdbaf7270b318b229e00b05fee9c8dee
parentb6f69fc4a35252b1ee771d9219b07151d40c24b8
parente0422d3c61ef629eb75adf0e78b6d9746684dfe0
Merge branch 'local'

git-svn-id: svn+ssh://svn.gna.org/svn/forgeplucker@177 7e9734f2-5825-4a1b-abe6-0096d909c21f