Merge branch 'stable' into niit
authorHenning Rogge <hrogge@googlemail.com>
Wed, 6 Jan 2010 20:18:10 +0000 (21:18 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Wed, 6 Jan 2010 20:18:10 +0000 (21:18 +0100)
1  2 
src/cfgparser/oparse.y

Simple merge