Merge branch 'mirceakitsune/bugfixes'
authorRudolf Polzer <rpolzer@nb-04.(none)>
Thu, 25 Mar 2010 14:27:34 +0000 (15:27 +0100)
committerRudolf Polzer <rpolzer@nb-04.(none)>
Thu, 25 Mar 2010 14:27:34 +0000 (15:27 +0100)

Trivial merge