Merging revision 29560:30125 from trunk.
authorJoerg Mueller <nexyon@gmail.com>
Thu, 8 Jul 2010 17:31:43 +0000 (17:31 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Thu, 8 Jul 2010 17:31:43 +0000 (17:31 +0000)

Trivial merge