[project @ aafshar@gmail.com-20071129134020-t9bu5sg6sld1i4hb] merge from welterde
[project @ aafshar@gmail.com-20071129134020-t9bu5sg6sld1i4hb]
merge from welterde

passy/glashammer-rdrei,passy/glashammer-rdrei