merge of '7ac1631904ff857a0e9ed8eabad7d3bb2cde797a'
authorRobert Schuster <thebohemian@gmx.net>
Mon, 22 Sep 2008 21:58:56 +0000 (21:58 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Mon, 22 Sep 2008 21:58:56 +0000 (21:58 +0000)
commit6175b1e464abe51c43d56376dcc162ac39365bad
tree5af6e01860aa879f97c098dee08627e8887edfd3
parent6c86aac83d8f5220ca780d4a8ce3f1a2e50923b7
parent7708f59344c8b55783cf0db2c19d846bc6f348b4
Merge ... '7ac1631904ff857a0e9ed8eabad7d3bb2cde797a'
     and 'f8b059d4fa30751c4f6fddabedcf7b022798effe'