Merged changes from master
commit0ed7d8f5543b0514ff4e24cd5cfa6a168fbbe96a
authorBastian Eicher <bastian@eicher.net>
Wed, 20 Apr 2011 19:56:00 +0000 (20 21:56 +0200)
committerBastian Eicher <bastian@eicher.net>
Wed, 20 Apr 2011 19:56:00 +0000 (20 21:56 +0200)
tree301206f14b7165e46e95eb4458057c4880a42ef0
parent0b3930ef0bb8c00a121a035ed332324e6ae22d07
parentc59f98b1bd82af189363661ee78e735aebfa604c
Merged changes from master